Update module

pi-module · Apr 11, 2015 · be661a0 · be661a0
1 parent d4ab3f4
commit be661a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/Api/Question.php b/src/Api/Question.php
@@ -60,14 +60,15 @@ public function canonizeQuestion($question)
         // Set tags
         if (!empty($question['tag'])) {
             $tags = Json::decode($question['tag']);
+            $tags = array_unique($tags);
             foreach ($tags as $tag) {
                 $tagList[] = array(
                     'term' => $tag,
                     'url'  => Pi::url(Pi::service('url')->assemble('ask', array(
                         'module'        => $this->getModule(),
                         'controller'    => 'tag',
                         'action'        => 'term',
-                        'slug'          => urlencode($tag),
+                        'slug'          => $tag,
                     ))),
                 );
             }

diff --git a/src/Controller/Front/IndexController.php b/src/Controller/Front/IndexController.php
@@ -67,8 +67,9 @@ public function askList($where)
     public function askPaginator($template, $where)
     {
         $template['module'] = $this->params('module');
-        $template['order'] = $this->params('order');
+        //$template['order'] = $this->params('order');
         $template['page'] = $this->params('page', 1);
+        $template['slug'] = $this->params('slug');
         // get count     
         $columns = array('count' => new Expression('count(*)'));
         $select = $this->getModel('question')->select()->where($where)->columns($columns);
@@ -84,7 +85,8 @@ public function askPaginator($template, $where)
                 'module'        => $this->getModule(),
                 'controller'    => $template['controller'],
                 'action'        => $template['action'],
-                'order'          => $template['order'],
+                //'order'          => $template['order'],
+                'slug'          => urlencode($template['slug']),
             )),
         ));
         return $paginator;

diff --git a/src/Controller/Front/TagController.php b/src/Controller/Front/TagController.php
@@ -33,7 +33,7 @@ public function termAction()
         // Check slug
         if (!isset($slug) || empty($slug)) {
             $url = array('', 'module' => $module, 'controller' => 'index', 'action' => 'index');
-            $this->jump($url, __('The tag not set.'), 'error');
+            //$this->jump($url, __('The tag not set.'), 'error');
         }
         // Get id from tag module
         $tagId = array();
@@ -44,7 +44,7 @@ public function termAction()
         // Check slug
         if (empty($tagId)) {
             $url = array('', 'module' => $module, 'controller' => 'index', 'action' => 'index');
-            $this->jump($url, __('The tag not found.'), 'error');
+            //$this->jump($url, __('The tag not found.'), 'error');
         }
         // Set question info
         $where = array('status' => 1, 'type' => 'Q', 'id' => $tagId);

diff --git a/src/Route/Ask.php b/src/Route/Ask.php
@@ -119,7 +119,7 @@ public function assemble(
             $url['action'] = $mergedParams['action'];
         }
         if (!empty($mergedParams['slug'])) {
-            $url['slug'] = $mergedParams['slug'];
+            $url['slug'] = urlencode($mergedParams['slug']);
         }
         if (!empty($mergedParams['order'])) {
             $url['order'] = 'order' . $this->paramDelimiter . $mergedParams['order'];