From 33882d4fa788e44462709718050238202a89a6ea Mon Sep 17 00:00:00 2001
From: William MARTIN <william.martin@power-lan.com>
Date: Mon, 3 Oct 2011 10:00:35 +0200
Subject: [PATCH 1/2] Update how the myIssue view works. It's allow to display
 this view for other members. In the issue summary, we can now follow make
 links for each user display in the part "Unresolved: By Assignee".

---
 src/IDF/Views/Issue.php                     | 46 ++++++++++++++-------
 src/IDF/conf/urls.php                       |  2 +-
 src/IDF/templates/idf/issues/base.html      |  2 +-
 src/IDF/templates/idf/issues/my-issues.html | 10 ++---
 src/IDF/templates/idf/issues/summary.html   |  2 +-
 src/IDF/templates/idf/js-hotkeys.html       |  4 +-
 src/IDF/templates/idf/review/base-full.html |  2 +-
 7 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php
index 9c749af..3ef8e96 100644
--- a/src/IDF/Views/Issue.php
+++ b/src/IDF/Views/Issue.php
@@ -113,7 +113,7 @@ class IDF_Views_Issue
                         $obj = Pluf::factory('Pluf_User')->getOne(array('filter'=>'id='.$user));
                         $key = $obj->first_name . ' ' . $obj->last_name;
                     }
-                    $ownerStatistics[$key] = array($nb, (int)(100 * $nb / $opened));
+                    $ownerStatistics[$key] = array($nb, (int)(100 * $nb / $opened), $obj->login);
                 }
 
                 // Issue class tag statistics
@@ -313,42 +313,55 @@ class IDF_Views_Issue
      *
      * Only open issues are shown.
      */
-    public $myIssues_precond = array('IDF_Precondition::accessIssues',
-                                     'Pluf_Precondition::loginRequired');
+    public $myIssues_precond = array('IDF_Precondition::accessIssues');
     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[2]) {
+        switch ($match[3]) {
         case 'submit':
-            $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));
+            $titleFormat = 
+            $f_sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $user->id));
             break;
         case 'submitclosed':
-            $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));
+            $title = __('%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));
             break;
         case 'ownerclosed':
-            $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));
+            $title = __('%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));
             break;
         default:
-            $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));
+            $title = __('%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));
             break;
         }
+        $title = sprintf(__('%s %s Submitted %s Issues'),
+                         $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, $request->user->id));
+        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $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, $request->user->id));
+        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $otags).')', array($prj->id, $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, $request->user->id));
+        $sql = new Pluf_SQL('project=%s AND submitter=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $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, $request->user->id));
+        $sql = new Pluf_SQL('project=%s AND owner=%s AND status IN ('.implode(', ', $ctags).')', array($prj->id, $user->id));
         $nb_owner_closed = Pluf::factory('IDF_Issue')->getCount(array('filter'=>$sql->gen()));
 
         // Paginator to paginate the issues
@@ -377,6 +390,7 @@ class IDF_Views_Issue
         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,
diff --git a/src/IDF/conf/urls.php b/src/IDF/conf/urls.php
index 03779c0..a011f37 100644
--- a/src/IDF/conf/urls.php
+++ b/src/IDF/conf/urls.php
@@ -153,7 +153,7 @@ $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/create/$#',
                'model' => 'IDF_Views_Issue',
                'method' => 'create');
 
-$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/my/(\w+)/$#',
+$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/(.*)/(\w+)/$#',
                'base' => $base,
                'model' => 'IDF_Views_Issue',
                'method' => 'myIssues');
diff --git a/src/IDF/templates/idf/issues/base.html b/src/IDF/templates/idf/issues/base.html
index 636d5da..0856f8f 100644
--- a/src/IDF/templates/idf/issues/base.html
+++ b/src/IDF/templates/idf/issues/base.html
@@ -4,7 +4,7 @@
 <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::myIssues', array($project.shortname, '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, $user.login, '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" />
diff --git a/src/IDF/templates/idf/issues/my-issues.html b/src/IDF/templates/idf/issues/my-issues.html
index f3d1d27..9823cd2 100644
--- a/src/IDF/templates/idf/issues/my-issues.html
+++ b/src/IDF/templates/idf/issues/my-issues.html
@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t2{assign $inMyIssues = true}{/block}
+{block docclass}yui-t2{if $user.login == $login}{assign $inMyIssues = true}{/if}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}
@@ -8,10 +8,10 @@
 
 {/block}
 {block context}
-{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')}
+{aurl 'owner_url', 'IDF_Views_Issue::myIssues', array($project.shortname, $login, 'owner')}
+{aurl 'submit_url', 'IDF_Views_Issue::myIssues', array($project.shortname, $login, 'submit')}
+{aurl 'owner_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, $login, 'ownerclosed')}
+{aurl 'submit_closed_url', 'IDF_Views_Issue::myIssues', array($project.shortname, $login, '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}
diff --git a/src/IDF/templates/idf/issues/summary.html b/src/IDF/templates/idf/issues/summary.html
index bfff813..61e117a 100644
--- a/src/IDF/templates/idf/issues/summary.html
+++ b/src/IDF/templates/idf/issues/summary.html
@@ -71,7 +71,7 @@
     <tbody>
     {foreach $ownerStatistics as $key => $value}
         <tr>
-        <td class="name">{$key}</td>
+        <td class="name"><a href="{url 'IDF_Views_Issue::myIssues', array($project.shortname, $value[2], 'owner')}">{$key}</a></td>
         <td class="count">{$value[0]}</td>
         <td class="graph">
             <table class='graph'>
diff --git a/src/IDF/templates/idf/js-hotkeys.html b/src/IDF/templates/idf/js-hotkeys.html
index 66793fb..78ecb37 100644
--- a/src/IDF/templates/idf/js-hotkeys.html
+++ b/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::myIssues', array($project.shortname, 'submit')}
-{hotkey 'Shift+w', 'IDF_Views_Issue::myIssues', array($project.shortname, 'owner')}
+{hotkey 'Shift+m', 'IDF_Views_Issue::myIssues', array($project.shortname, $user.login, 'submit')}
+{hotkey 'Shift+w', 'IDF_Views_Issue::myIssues', array($project.shortname, $user.login, 'owner')}
 {/if}{/if} //-->
 </script>
 
diff --git a/src/IDF/templates/idf/review/base-full.html b/src/IDF/templates/idf/review/base-full.html
index 4d2b360..370e056 100644
--- a/src/IDF/templates/idf/review/base-full.html
+++ b/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::myIssues', array($project.shortname, '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, $user.login, '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'}" />

From d860f299fdec7dfbcf7c602f8d7841c944ecb097 Mon Sep 17 00:00:00 2001
From: William MARTIN <william.martin@power-lan.com>
Date: Mon, 3 Oct 2011 10:17:10 +0200
Subject: [PATCH 2/2] The last part of the previous patch.

---
 src/IDF/Views/Issue.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php
index 3ef8e96..aa37634 100644
--- a/src/IDF/Views/Issue.php
+++ b/src/IDF/Views/Issue.php
@@ -332,23 +332,23 @@ class IDF_Views_Issue
         if (count($ctags) == 0) $ctags[] = 0;
         switch ($match[3]) {
         case 'submit':
-            $titleFormat = 
+            $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));
             break;
         case 'submitclosed':
-            $title = __('%s %s Closed Submitted %s Issues');
+            $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));
             break;
         case 'ownerclosed':
-            $title = __('%s %s Closed Working %s Issues');
+            $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));
             break;
         default:
-            $title = __('%s %s Working %s Issues');
+            $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));
             break;
         }
-        $title = sprintf(__('%s %s Submitted %s Issues'),
+        $title = sprintf($titleFormat,
                          $user->first_name,
                          $user->last_name,
                          (string) $prj);