Indefero

Indefero Commit Details


Date:2011-10-03 03:00:35 (13 years 2 months ago)
Author:William MARTIN
Branch:develop, feature.diff-whitespace, feature.issue-of-others, feature.wiki-default-page, release-1.2, release-1.3
Commit:33882d4fa788e44462709718050238202a89a6ea
Parents: 13fad756abfc0f29b1f47b9ed18bde66492f7a41
Message: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".
Changes:

File differences

src/IDF/Views/Issue.php
113113
114114
115115
116
116
117117
118118
119119
......
313313
314314
315315
316
317
316
318317
319318
320319
320
321
322
323
324
325
326
327
328
321329
322330
323331
324332
325
333
326334
327
328
335
336
329337
330338
331
332
339
340
333341
334342
335
336
343
344
337345
338346
339
340
347
348
341349
342350
351
352
353
354
355
343356
344
357
345358
346
359
347360
348361
349
362
350363
351
364
352365
353366
354367
......
377390
378391
379392
393
380394
381395
382396
$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␊
*␊
* 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␊
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,␊
src/IDF/conf/urls.php
153153
154154
155155
156
156
157157
158158
159159
'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');␊
src/IDF/templates/idf/issues/base.html
44
55
66
7
7
88
99
1010
<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" />␊
src/IDF/templates/idf/issues/my-issues.html
11
2
2
33
44
55
......
88
99
1010
11
12
13
14
11
12
13
14
1515
1616
1717
{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()}␊
␊
{/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}␊
src/IDF/templates/idf/issues/summary.html
7171
7272
7373
74
74
7575
7676
7777
<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'>␊
src/IDF/templates/idf/js-hotkeys.html
1010
1111
1212
13
14
13
14
1515
1616
1717
{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>␊
␊
src/IDF/templates/idf/review/base-full.html
44
55
66
7
7
88
99
1010
<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'}" />␊

Archive Download the corresponding diff file

Page rendered in 0.09707s using 13 queries.