Remove a couple of unused calls to get a list of project tags; these

calls are currently done from within the tags-cloud template most of
the time, which is ugly, but the way it works as of now.

AUTHORS

@@ -33,6 +33,7 @@ Much appreciated contributors (in alphabetical order):
     Samuel Suther <info@suther.de>                  - German translation
     Sindre R. Myren <sindrero@stud.ntnu.no>
     Stewart Platt <stew@futurete.ch>
+    Stéphane Baron <sbaron>
     Thomas Keller <me@thomaskeller.biz>             - Monotone support
     Vladimir Solomatin <slash>
     William Martin <william.martin@lcpc.fr>

NEWS.mdtext

@@ -40,6 +40,7 @@ or newer to properly run this version of Indefero!
   as we have no information what the author string is actually encoded in
 - Indefero no longer displays an empty parents paragraph in the commit view for root revisions of
   a git repository
+- Indefero now only shows the tags of the closed and not the open issues in the closed issues list
 
 ## Documentation
 

src/IDF/Project.php

@@ -132,7 +132,7 @@ class IDF_Project extends Pluf_Model
         }
         return $projects[0];
     }
-    
+
     /**
      * Returns the number of open/closed issues.
      *
@@ -167,7 +167,7 @@ GROUP BY uid";
             $key = ($v['id'] === '-1') ? null : $v['id'];
             $ownerStatistics[$key] = (int)$v['nb'];
         }
-        
+
         arsort($ownerStatistics);
 
         return $ownerStatistics;
@@ -178,9 +178,10 @@ GROUP BY uid";
      *
      * @param string Status ('open'), 'closed'
      * @param IDF_Tag Subfilter with a label (null)
+     * @param array Restrict further to a list of ids
      * @return int Count
      */
-    public function getIssueCountByStatus($status='open', $label=null)
+    public function getIssueCountByStatus($status='open', $label=null, $ids=array())
     {
         switch ($status) {
         case 'open':
@@ -203,12 +204,48 @@ GROUP BY uid";
             $sql2 = new Pluf_SQL('idf_tag_id=%s', array($label->id));
             $sql->SAnd($sql2);
         }
+        if (count($ids) > 0) {
+            $sql2 = new Pluf_SQL(sprintf('id IN (%s)', implode(', ', $ids)));
+            $sql->SAnd($sql2);
+        }
         $params = array('filter' => $sql->gen());
         if (!is_null($label)) { $params['view'] = 'join_tags'; }
         $gissue = new IDF_Issue();
         return $gissue->getCount($params);
     }
 
+    /**
+     * Get the tags for a specific list of issues.
+     *
+     * @param string Status ('open') or 'closed'
+     * @param array A list of issue ids
+     * @return array An array of tag objects
+     */
+    public function getTagsByIssues($issue_ids=array())
+    {
+        // make the below query always a valid one
+        if (count($issue_ids) == 0) $issue_ids[] = 0;
+
+        $assocTable = $this->_con->pfx.'idf_issue_idf_tag_assoc';
+        $query = sprintf(
+            'SELECT DISTINCT idf_tag_id FROM %s '.
+            'WHERE idf_issue_id IN (%s) '.
+            'GROUP BY idf_tag_id',
+            $assocTable, implode(',', $issue_ids)
+        );
+
+        $db = Pluf::db();
+        $dbData = $db->select($query);
+        $ids = array(0);
+        foreach ($dbData as $data) {
+            $ids[] = $data['idf_tag_id'];
+        }
+
+        $sql = new Pluf_SQL(sprintf('id IN (%s)', implode(', ', $ids)));
+        $model = new IDF_Tag();
+        return $model->getList(array('filter' => $sql->gen()));
+    }
+
     /**
      * Get the open/closed tag ids as they are often used when doing
      * listings.
@@ -415,7 +452,11 @@ GROUP BY uid";
         foreach ($this->_con->select($sql) as $idc) {
             $tag = new IDF_Tag($idc['id']);
             $tag->nb_use = $idc['nb_use'];
-            $tags[] = $tag;
+            // group by class
+            if (!array_key_exists($tag->class, $tags)) {
+                $tags[$tag->class] = array();
+            }
+            $tags[$tag->class][] = $tag;
         }
         return new Pluf_Template_ContextVars($tags);
     }

src/IDF/Views/Download.php

@@ -319,13 +319,11 @@ class IDF_Views_Download
         $pag->no_results_text = __('No downloads were found.');
         $pag->sort_order = array('creation_dtime', 'DESC');
         $pag->setFromRequest($request);
-        $tags = $prj->getTagCloud('downloads');
         return Pluf_Shortcuts_RenderToResponse('idf/downloads/index.html',
                                                array(
                                                      'page_title' => $title,
                                                      'label' => $tag,
                                                      'downloads' => $pag,
-                                                     'tags' => $tags,
                                                      'dlabel' => $dtag,
                                                      ),
                                                $request);

src/IDF/Views/Issue.php

@@ -71,7 +71,9 @@ class IDF_Views_Issue
                         'page_title' => $title,
                         'open' => $open,
                         'closed' => $closed,
-                        'issues' => $pag);
+                        'issues' => $pag,
+                        'cloud' => 'issues',
+                );
         if ($api) return $params;
         return Pluf_Shortcuts_RenderToResponse('idf/issues/index.html',
                                                $params, $request);
@@ -88,7 +90,7 @@ class IDF_Views_Issue
         $ownerStatistics = array();
         $status = array();
         $isTrackerEmpty = false;
-        
+
         $prj = $request->project;
         $opened = $prj->getIssueCountByStatus('open');
         $closed = $prj->getIssueCountByStatus('closed');
@@ -102,26 +104,26 @@ class IDF_Views_Issue
                 $status['Open'] = array($opened, (int)(100 * $opened / ($opened + $closed)));
                 $status['Closed'] = array($closed, (int)(100 * $closed / ($opened + $closed)));
             }
-            
+
             if ($opened > 0) {
                 // Issue owner statistics
                 $owners = $prj->getIssueCountByOwner('open');
                 foreach ($owners as $user => $nb) {
                     if ($user === '') {
                         $key = __('Not assigned');
-                        $login = null;
                     } else {
                         $obj = Pluf::factory('Pluf_User')->getOne(array('filter'=>'id='.$user));
                         $key = $obj->first_name . ' ' . $obj->last_name;
-                        $login = $obj->login;
                     }
-                    $ownerStatistics[$key] = array($nb, (int)(100 * $nb / $opened), $login);
+                    $ownerStatistics[$key] = array($nb, (int)(100 * $nb / $opened));
                 }
 
                 // Issue class tag statistics
-                $tags = $prj->getTagCloud();
-                foreach ($tags as $t) {
-                    $tagStatistics[$t->class][$t->name] = array($t->nb_use, $t->id);
+                $grouped_tags = $prj->getTagCloud();
+                foreach ($grouped_tags as $class => $tags) {
+                    foreach ($tags as $tag) {
+                        $tagStatistics[$class][$tag->name] = array($tag->nb_use, $tag->id);
+                    }
                 }
                 foreach($tagStatistics as $k => $v) {
                     $nbIssueInClass = 0;
@@ -132,15 +134,15 @@ class IDF_Views_Issue
                         $tagStatistics[$k][$kk] = array($vv[0], (int)(100 * $vv[0] / $nbIssueInClass), $vv[1]);
                     }
                 }
-                
+
                 // Sort
                 krsort($tagStatistics);
                 arsort($ownerStatistics);
             }
         }
-        
+
         $title = sprintf(__('Summary of tracked issues in %s.'), (string) $prj);
-        
+
         return Pluf_Shortcuts_RenderToResponse('idf/issues/summary.html',
                                                array('page_title' => $title,
                                                      'trackerEmpty' => $isTrackerEmpty,
@@ -151,7 +153,7 @@ class IDF_Views_Issue
                                                      ),
                                                $request);
     }
-    
+
     /**
      * View the issues watch list of a given user.
      * Limited to a specified project
@@ -315,55 +317,42 @@ class IDF_Views_Issue
      *
      * Only open issues are shown.
      */
-    public $userIssues_precond = array('IDF_Precondition::accessIssues');
-    public function userIssues($request, $match)
+    public $myIssues_precond = array('IDF_Precondition::accessIssues',
+                                     'Pluf_Precondition::loginRequired');
+    public function myIssues($request, $match)
     {
         $prj = $request->project;
-        
-        $sql = new Pluf_SQL('login=%s', array($match[2]));
-        $user = Pluf::factory('Pluf_User')->getOne(array('filter' => $sql->gen()));
-        if ($user === null) {
-            $url = Pluf_HTTP_URL_urlForView('IDF_Views_Issue::index',
-                                            array($prj->shortname));
-            return new Pluf_HTTP_Response_Redirect($url);
-        }
-        
         $otags = $prj->getTagIdsByStatus('open');
         $ctags = $prj->getTagIdsByStatus('closed');
         if (count($otags) == 0) $otags[] = 0;
         if (count($ctags) == 0) $ctags[] = 0;
-        switch ($match[3]) {
+        switch ($match[2]) {
         case 'submit':
-            $titleFormat = __('%s %s Submitted %s Issues');
-            $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $user->id));
+            $title = sprintf(__('My Submitted %s Issues'), (string) $prj);
+            $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id));
             break;
         case 'submitclosed':
-            $titleFormat = __('%s %s Closed Submitted %s Issues');
-            $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $user->id));
+            $title = sprintf(__('My Closed Submitted %s Issues'), (string) $prj);
+            $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id));
             break;
         case 'ownerclosed':
-            $titleFormat = __('%s %s Closed Working %s Issues');
-            $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $user->id));
+            $title = sprintf(__('My Closed Working %s Issues'), (string) $prj);
+            $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id));
             break;
         default:
-            $titleFormat = __('%s %s Working %s Issues');
-            $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $user->id));
+            $title = sprintf(__('My Working %s Issues'), (string) $prj);
+            $f_sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id));
             break;
         }
-        $title = sprintf($titleFormat,
-                         $user->first_name,
-                         $user->last_name,
-                         (string) $prj);
-        
         // Get stats about the issues
-        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $user->id));
+        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id));
         $nb_submit = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen()));
-        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $user->id));
+        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $request->user->id));
         $nb_owner = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen()));
         // Closed issues
-        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $user->id));
+        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id));
         $nb_submit_closed = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen()));
-        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $user->id));
+        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $request->user->id));
         $nb_owner_closed = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen()));
 
         // Paginator to paginate the issues
@@ -374,7 +363,7 @@ class IDF_Views_Issue
                                        'current_user' => $request->user);
         $pag->summary = __('This table shows the open issues.');
         $pag->forced_where = $f_sql;
-        $pag->action = array('IDF_Views_Issue::userIssues', array($prj->shortname, $match[2]));
+        $pag->action = array('IDF_Views_Issue::myIssues', array($prj->shortname, $match[2]));
         $pag->sort_order = array('modif_dtime', 'ASC'); // will be reverted
         $pag->sort_reverse_order = array('modif_dtime');
         $pag->sort_link_title = true;
@@ -389,10 +378,9 @@ class IDF_Views_Issue
         $pag->items_per_page = 10;
         $pag->no_results_text = __('No issues were found.');
         $pag->setFromRequest($request);
-        return Pluf_Shortcuts_RenderToResponse('idf/issues/userIssues.html',
+        return Pluf_Shortcuts_RenderToResponse('idf/issues/my-issues.html',
                                                array('project' => $prj,
                                                      'page_title' => $title,
-                                                     'login' => $user->login,
                                                      'nb_submit' => $nb_submit,
                                                      'nb_owner' => $nb_owner,
                                                      'nb_submit_closed' => $nb_submit_closed,
@@ -445,45 +433,142 @@ class IDF_Views_Issue
 
     public $search_precond = array('IDF_Precondition::accessIssues');
     public function search($request, $match)
+    {
+        $query = !isset($request->REQUEST['q']) ? '' : $request->REQUEST['q'];
+        return $this->doSearch($request, $query, 'open');
+    }
+
+    public $searchStatus_precond = array('IDF_Precondition::accessIssues');
+    public function searchStatus($request, $match)
+    {
+        $query  = !isset($request->REQUEST['q']) ? '' : $request->REQUEST['q'];
+        $status = in_array($match[2], array('open', 'closed')) ? $match[2] : 'open';
+        return $this->doSearch($request, $query, $status);
+    }
+
+    public $searchLabel_precond = array('IDF_Precondition::accessIssues');
+    public function searchLabel($request, $match)
+    {
+        $query  = !isset($request->REQUEST['q']) ? '' : $request->REQUEST['q'];
+        $tag_id = intval($match[2]);
+        $status = in_array($match[3], array('open', 'closed')) ? $match[3] : 'open';
+        return $this->doSearch($request, $query, $status, $tag_id);
+    }
+
+    private function doSearch($request, $query, $status, $tag_id=null)
     {
         $prj = $request->project;
-        if (!isset($request->REQUEST['q']) or trim($request->REQUEST['q']) == '') {
-            $url =  Pluf_HTTP_URL_urlForView('IDF_Views_Issue::index',
-                                             array($prj->shortname));
+        if (trim($query) == '') {
+            $url =  Pluf_HTTP_URL_urlForView('IDF_Views_Issue::index', array($prj->shortname));
             return new Pluf_HTTP_Response_Redirect($url);
         }
-        $q = $request->REQUEST['q'];
-        $title = sprintf(__('Search Issues - %s'), $q);
-        $issues = new Pluf_Search_ResultSet(IDF_Search::mySearch($q, $prj, 'IDF_Issue'));
-        if (count($issues) > 100) {
-            // no more than 100 results as we do not care
-            $issues->results = array_slice($issues->results, 0, 100);
+
+        $tag = null;
+        if ($tag_id !== null) {
+            $tag = Pluf_Shortcuts_GetObjectOr404('IDF_Tag', $tag_id);
         }
+
+        $title = sprintf(__('Search issues - %s'), $query);
+        if ($status === 'closed') {
+            $title = sprintf(__('Search closed issues - %s'), $query);
+        }
+
+        // using Plufs ResultSet implementation here is inefficient, because
+        // it makes a SELECT for each item and does not allow for further
+        // filtering neither, so we just return the ids and filter by them
+        // and other things in the next round
+        $results = IDF_Search::mySearch($query, $prj, 'IDF_Issue');
+
+        $issue_ids = array(0);
+        foreach ($results as $result) {
+            $issue_ids[] = $result['model_id'];
+        }
+
+        $otags = $prj->getTagIdsByStatus($status);
+        if (count($otags) == 0) $otags[] = 0;
+        $sql = new Pluf_SQL(
+            'id IN ('.implode(',', $issue_ids).') '.
+            'AND status IN ('.implode(', ', $otags).') '.
+            ($tag_id !== null ? 'AND idf_tag_id='.$tag_id.' ' : '')
+        );
+        $model = new IDF_Issue();
+        $issues = $model->getList(array('filter' => $sql->gen(), 'view' => 'join_tags'));
+
+        // we unfortunately loose the original sort order,
+        // so we manually have to apply it here again
+        $sorted_issues = new ArrayObject();
+        $filtered_issue_ids = array(0);
+        foreach ($issue_ids as $issue_id) {
+            foreach ($issues as $issue) {
+                if ($issue->id != $issue_id)
+                    continue;
+                if (array_key_exists($issue_id, $sorted_issues))
+                    continue;
+                $sorted_issues[$issue_id] = $issue;
+                $filtered_issue_ids[] = $issue_id;
+            }
+        }
+
         $pag = new Pluf_Paginator();
-        $pag->items = $issues;
         $pag->class = 'recent-issues';
-        $pag->item_extra_props = array('project_m' => $prj,
-                                       'shortname' => $prj->shortname,
-                                       'current_user' => $request->user);
+        $pag->items = $sorted_issues;
+        $pag->item_extra_props = array(
+            'project_m' => $prj,
+            'shortname' => $prj->shortname,
+            'current_user' => $request->user
+        );
         $pag->summary = __('This table shows the found issues.');
-        $pag->action = array('IDF_Views_Issue::search', array($prj->shortname), array('q'=> $q));
         $pag->extra_classes = array('a-c', '', 'a-c', '');
-        $list_display = array(
-                              'id' => __('Id'),
-                              array('summary', 'IDF_Views_Issue_SummaryAndLabels', __('Summary')),
-                              array('status', 'IDF_Views_Issue_ShowStatus', __('Status')),
-                              array('modif_dtime', 'Pluf_Paginator_DateAgo', __('Last Updated')),
-                              );
-        $pag->configure($list_display);
-        $pag->items_per_page = 100;
+        $pag->configure(array(
+            'id' => __('Id'),
+            array('summary', 'IDF_Views_Issue_SummaryAndLabels', __('Summary')),
+            array('status', 'IDF_Views_Issue_ShowStatus', __('Status')),
+            array('modif_dtime', 'Pluf_Paginator_DateAgo', __('Last Updated')),
+        ));
+        // disable paginating
+        $pag->items_per_page = PHP_INT_MAX;
         $pag->no_results_text = __('No issues were found.');
         $pag->setFromRequest($request);
-        $params = array('page_title' => $title,
-                        'issues' => $pag,
-                        'q' => $q,
-                        );
-        return Pluf_Shortcuts_RenderToResponse('idf/issues/search.html', $params, $request);
 
+        if ($tag_id === null) {
+            $pag->action = array('IDF_Views_Issue::searchStatus',
+                array($prj->shortname, $status),
+                array('q'=> $query),
+            );
+        } else {
+            $pag->action = array('IDF_Views_Issue::searchLabel',
+                array($prj->shortname, $tag_id, $status),
+                array('q'=> $query),
+            );
+        }
+
+        // get stats about the issues
+        $open = $prj->getIssueCountByStatus('open', $tag, $issue_ids);
+        $closed = $prj->getIssueCountByStatus('closed', $tag, $issue_ids);
+
+        // query the available tags for this search result
+        $all_tags = $prj->getTagsByIssues($filtered_issue_ids);
+        $grouped_tags = array();
+        foreach ($all_tags as $atag) {
+            // group by class
+            if (!array_key_exists($atag->class, $grouped_tags)) {
+                $grouped_tags[$atag->class] = array();
+            }
+            $grouped_tags[$atag->class][] = $atag;
+        }
+
+        $params = array(
+            'page_title' => $title,
+            'issues' => $pag,
+            'query' => $query,
+            'status' => $status,
+            'open' => $open,
+            'closed' => $closed,
+            'tag' => $tag,
+            'all_tags' => $grouped_tags,
+        );
+
+        return Pluf_Shortcuts_RenderToResponse('idf/issues/search.html', $params, $request);
     }
 
     public $view_precond = array('IDF_Precondition::accessIssues');

src/IDF/Views/Wiki.php

@@ -152,13 +152,11 @@ class IDF_Views_Wiki
         $pag->items_per_page = 25;
         $pag->no_results_text = __('No documentation pages were found.');
         $pag->setFromRequest($request);
-        $tags = $prj->getTagCloud('wiki');
         return Pluf_Shortcuts_RenderToResponse('idf/wiki/index.html',
                                                array(
                                                      'page_title' => $title,
                                                      'label' => $tag,
                                                      'pages' => $pag,
-                                                     'tags' => $tags,
                                                      'dlabel' => $dtag,
                                                      ),
                                                $request);

src/IDF/conf/urls.php

@@ -117,7 +117,7 @@ $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/$#',
                'base' => $base,
                'model' => 'IDF_Views_Issue',
                'method' => 'index');
-               
+
 $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/summary/$#',
                'base' => $base,
                'model' => 'IDF_Views_Issue',
@@ -128,6 +128,16 @@ $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/search/$#',
                'model' => 'IDF_Views_Issue',
                'method' => 'search');
 
+$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/search/status/(\w+)/$#',
+               'base' => $base,
+               'model' => 'IDF_Views_Issue',
+               'method' => 'searchStatus');
+
+$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/search/label/(\d+)/(\w+)/$#',
+               'base' => $base,
+               'model' => 'IDF_Views_Issue',
+               'method' => 'searchLabel');
+
 $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/(\d+)/$#',
                'base' => $base,
                'model' => 'IDF_Views_Issue',
@@ -153,10 +163,10 @@ $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/create/$#',
                'model' => 'IDF_Views_Issue',
                'method' => 'create');
 
-$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/(.*)/(\w+)/$#',
+$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/my/(\w+)/$#',
                'base' => $base,
                'model' => 'IDF_Views_Issue',
-               'method' => 'userIssues');
+               'method' => 'myIssues');
 
 $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/attachment/(\d+)/(.*)$#',
                'base' => $base,

src/IDF/templates/idf/issues/base.html

@@ -4,10 +4,10 @@
 <div id="sub-tabs">
 <a {if $inSummaryIssues}class="active" {/if}href="{url 'IDF_Views_Issue::summary', array($project.shortname)}">{trans 'Summary'}</a>
 | <a {if $inOpenIssues}class="active" {/if}href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Open Issues'}</a>
-{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>
+{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}">{trans 'My Issues'}</a>
 | <a {if $inWatchList}class="active" {/if}href="{url 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}">{trans 'My watch list'}</a>{/if} |
 <form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
-<input accesskey="4" type="text" value="{$q}" name="q" size="20" />
+<input accesskey="4" type="text" value="{$query}" name="q" size="20" />
 <input type="submit" name="s" value="{trans 'Search'}" />
 </form>
 {if $inIssue} |

src/IDF/templates/idf/issues/by-label.html

@@ -8,16 +8,15 @@
 
 {/block}
 {block context}
-<p><strong>{trans 'Label:'}</strong>
-{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
-<a href="{$url}" class="label"><strong>{$label.class}:</strong>{$label.name}</a></p>
 {aurl 'open_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
 {aurl 'closed_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'closed')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>
-{/blocktrans}{if $completion}
+{/blocktrans}
+<p><strong>{trans 'Label:'}</strong>
+{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
+<a href="{$url}" class="label"><strong>{$label.class}:</strong>{$label.name}</a></p>
+{if $completion}
 <p><strong>{trans 'Completion:'}</strong> {$completion}</p>
 {/if}
-
-
 {/block}

src/IDF/templates/idf/issues/index.html

@@ -13,6 +13,5 @@
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
 {assign $cloud_url = 'IDF_Views_Issue::listLabel'}
-{assign $cloud = 'issues'}
 {include 'idf/tags-cloud.html'}
 {/block}

src/IDF/templates/idf/issues/my-issues.html

@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t2{if $user.login == $login}{assign $inMyIssues = true}{/if}{/block}
+{block docclass}yui-t2{assign $inMyIssues = true}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}
@@ -8,10 +8,10 @@
 
 {/block}
 {block context}
-{aurl 'owner_url', 'IDF_Views_Issue::userIssues', array($project.shortname, $login, 'owner')}
-{aurl 'submit_url', 'IDF_Views_Issue::userIssues', array($project.shortname, $login, 'submit')}
-{aurl 'owner_closed_url', 'IDF_Views_Issue::userIssues', array($project.shortname, $login, 'ownerclosed')}
-{aurl 'submit_closed_url', 'IDF_Views_Issue::userIssues', array($project.shortname, $login, 'submitclosed')}
+{aurl 'owner_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'owner')}
+{aurl 'submit_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}
+{aurl 'owner_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'ownerclosed')}
+{aurl 'submit_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submitclosed')}
 <p><strong>{trans 'Submitted issues:'}</strong> <a href="{$submit_url}">{$nb_submit}</a> 
 {if $nb_submit_closed}<br /><span class="helptext">{blocktrans $nb_submit_closed}See the <a href="{$submit_closed_url}">{$nb_submit_closed} closed</a>.{plural}See the <a href="{$submit_closed_url}">{$nb_submit_closed} closed</a>.{/blocktrans}</span>{/if}</p>
 {if $nb_owner > 0}

src/IDF/templates/idf/issues/search.html

@@ -8,5 +8,25 @@
 
 {/block}
 {block context}
-<p><strong>{trans 'Found issues:'}</strong> {$issues.nb_items}</p>
+{aurl 'open_url',   'IDF_Views_Issue::searchStatus', array($project.shortname, 'open'),   array('q' => $query)}
+{aurl 'closed_url', 'IDF_Views_Issue::searchStatus', array($project.shortname, 'closed'), array('q' => $query)}
+{if $tag != null}
+{aurl 'open_url',   'IDF_Views_Issue::searchLabel', array($project.shortname, $tag.id, 'open'),   array('q' => $query)}
+{aurl 'closed_url', 'IDF_Views_Issue::searchLabel', array($project.shortname, $tag.id, 'closed'), array('q' => $query)}
+{/if}
+{blocktrans}
+<p><strong>Found open issues:</strong> <a href="{$open_url}">{$open}</a></p>
+<p><strong>Found closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
+{if $tag !== null}
+{blocktrans}<p><strong>Label:</strong>
+<a href="{$open_url}" class="label"><strong>{$tag.class}:</strong>{$tag.name}</a></p>{/blocktrans}
+{else}
+{* yes, this is duplicated from tags-cloud.html, but the code there cannot be easily overridden *}
+<div id="tagscloud" class="smaller"><dl>{foreach $all_tags as $class => $labels}
+<dt class="label">{$class}</dt>
+{foreach $labels as $idx => $label}
+{aurl 'url', 'IDF_Views_Issue::searchLabel', array($project.shortname, $label.id, $status), array('q'=> $query)}
+<dd><a href="{$url}" class="label">{$label.name}{if $idx != count($labels) - 1},{/if}</a></dd>
+{/foreach}{/foreach}</dl></p>
+{/if}
 {/block}

src/IDF/templates/idf/issues/summary.html

@@ -71,12 +71,7 @@
     <tbody>
     {foreach $ownerStatistics as $key => $value}
         <tr>
-        <td class="name">
-        {if !empty($value[2])}
-        {aurl 'url', 'IDF_Views_Issue::userIssues', array($project.shortname, $value[2], 'owner')}
-        <a href="{$url}">{$key}</a>
-        {else}{$key}{/if}
-        </td>
+        <td class="name">{$key}</td>
         <td class="count">{$value[0]}</td>
         <td class="graph">
             <table class='graph'>

src/IDF/templates/idf/js-hotkeys.html

@@ -10,8 +10,8 @@
 {if $hasWikiAccess}{hotkey 'Shift+o', 'IDF_Views_Wiki::index', array($project.shortname)}{/if}
 {if $hasSourceAccess}{hotkey 'Shift+s', 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}{/if}
 {if $hasIssuesAccess and !$user.isAnonymous()}
-{hotkey 'Shift+m', 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}
-{hotkey 'Shift+w', 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'owner')}
+{hotkey 'Shift+m', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}
+{hotkey 'Shift+w', 'IDF_Views_Issue::myIssues', array($project.shortname, 'owner')}
 {/if}{/if} //-->
 </script>
 

src/IDF/templates/idf/review/base-full.html

@@ -4,7 +4,7 @@
 <div id="sub-tabs">
 <a {if $inOpenReviews}class="active" {/if}href="{url 'IDF_Views_Review::index', array($project.shortname)}">{trans 'Open Reviews'}</a> {*
 
-{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>{/if} |
+{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}">{trans 'My Issues'}</a>{/if} |
 <form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
 <input accesskey="4" type="text" value="{$q}" name="q" size="20" />
 <input type="submit" name="s" value="{trans 'Search'}" />

src/IDF/templates/idf/review/index.html

@@ -5,17 +5,4 @@
 {if !$user.isAnonymous()}
 {aurl 'url', 'IDF_Views_Review::create', array($project.shortname)}
 <p><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/add.png'}" alt="+" align="bottom" /></a> <a href="{$url}">{trans 'Start Code Review'}</a></p>{/if}
-
 {/block}
-{block context}
-{*
-{aurl 'open_url', 'IDF_Views_Issue::index', array($project.shortname)}
-{aurl 'closed_url', 'IDF_Views_Issue::listStatus', array($project.shortname, 'closed')}
-{blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
-<p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
-{assign $class = ''}{assign $i = 0}
-<p class="smaller">{foreach $project.getTagCloud($cloud) as $label}
-{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
-{if $class != $label.class}{if $i != 0}<br />{/if}<strong class="label">{$label.class}:</strong> {/if}
-<a href="{$url}" class="label">{$label.name}</a>,{assign $class = $label.class}{assign $i = $i + 1}{/foreach}</p>
-*}{/block}

src/IDF/templates/idf/tags-cloud.html

@@ -1,8 +1,6 @@
-{assign $class = ''}{assign $i = 0}
-<div id="tagscloud" class="smaller"><dl>{foreach $project.getTagCloud($cloud) as $label}
+<div id="tagscloud" class="smaller"><dl>{foreach $project.getTagCloud($cloud) as $class => $labels}
+<dt class="label">{$class}</dt>
+{foreach $labels as $idx => $label}
 {aurl 'url', $cloud_url, array($project.shortname, $label.id, 'open')}
-{if $class != $label.class}<dt class="label">{$label.class}</dt>{assign $i = 0}{/if}
-<dd><a href="{$url}" class="label">{$label.name},</a></dd>
-{assign $class = $label.class}
-{assign $i = $i + 1}
-{/foreach}</dl></p>
+<dd><a href="{$url}" class="label">{$label.name}{if $idx != count($labels) - 1},{/if}</a></dd>
+{/foreach}{/foreach}</dl></p>