natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of projects.ceondo.com:indefero into develop

Browse Source
This commit is contained in:
William MARTIN 2011-07-05 11:31:05 +02:00
commit a016bcb51b
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/IDF/Project.php
View File

@ -152,15 +152,14 @@ class IDF_Project extends Pluf_Model
break; break;
} }
$sqlIssueTable = Pluf::factory('IDF_Issue')->getSqlTable(); $sqlIssueTable = Pluf::factory('IDF_Issue')->getSqlTable();
$query = <<<"QUERY" $query = "SELECT uid AS id,COUNT(uid) AS nb
SELECT uid AS id,COUNT(uid) AS nb
FROM ( FROM (
SELECT COALESCE(owner, -1) AS uid SELECT COALESCE(owner, -1) AS uid
FROM $sqlIssueTable FROM $sqlIssueTable
WHERE status IN ($tags) WHERE status IN ($tags)
) AS ff ) AS ff
GROUP BY uid GROUP BY uid";
QUERY;
$db = Pluf::db(); $db = Pluf::db();
$dbData = $db->select($query); $dbData = $db->select($query);
$ownerStatistics = array(); $ownerStatistics = array();

8
src/IDF/Views/Issue.php
View File

@ -747,7 +747,13 @@ class IDF_Views_Issue
else { else {
// ID-based search // ID-based search
if (is_numeric($query)) { if (is_numeric($query)) {
$sql = new Pluf_SQL('project=%s AND id LIKE %s', array($prj->id, $query.'%')); $sql = 'project=%s AND CAST(id AS VARCHAR) LIKE %s';
// MySQL can't cast to VARCHAR and a CAST to CHAR converts
// the whole number, not just the first digit
if (strtolower(Pluf::f('db_engine')) == 'mysql') {
$sql = 'project=%s AND CAST(id AS CHAR) LIKE %s';
}
$sql = new Pluf_SQL($sql, array($prj->id, $query.'%'));
$tmp = Pluf::factory('IDF_Issue')->getList(array( $tmp = Pluf::factory('IDF_Issue')->getList(array(
'filter' => $sql->gen(), 'filter' => $sql->gen(),
'order' => 'id ASC' 'order' => 'id ASC'

12
src/IDF/templates/idf/issues/feedfragment.xml
View File

@ -14,8 +14,18 @@
</ul>{/if} </ul>{/if}
{if $c.changes} {if $c.changes}
{foreach $c.changes as $w => $v} {foreach $c.changes as $w => $v}
<strong>{if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if}</strong> {if $w == 'lb'}{assign $l = implode(', ', $v)}{$l}{else}{$v}{/if}<br /> <strong>{if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if}{if $w == 'rel'}{trans 'Relations:'}{/if}</strong>
{if $w == 'lb' or $w == 'rel'}
{foreach $v as $t => $ls}
{foreach $ls as $l}
{if $t == 'rem'}<s>{/if}{$l}{if $t == 'rem'}</s>{/if}
{/foreach}
{/foreach}
{else}
{$v}
{/if}<br />
{/foreach} {/foreach}
{/if} {/if}
</div></content> </div></content>
</entry> </entry>

2
src/IDF/templates/idf/issues/issue-updated-email.txt
View File

@ -16,7 +16,7 @@
{if strlen($c.content) > 0}{$c.content|safe}{/if}{if $c.changedIssue()} {if strlen($c.content) > 0}{$c.content|safe}{/if}{if $c.changedIssue()}
{foreach $c.changes as $w => $v} {foreach $c.changes as $w => $v}
{if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if} {if $w == 'lb'}{assign $l = implode(', ', $v)}{$l}{else}{$v}{/if}{/foreach}{/if}{assign $attachments = $c.get_attachment_list()}{if $attachments.count() > 0} {if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if}{if $w == 'rel'}{trans 'Relations:'}{/if} {if $w == 'lb' or $w == 'rel'}{foreach $v as $t => $ls}{foreach $ls as $l}{if $t == 'rem'}-{/if}{$l} {/foreach}{/foreach}{else}{$v}{/if}{/foreach}{/if}{assign $attachments = $c.get_attachment_list()}{if $attachments.count() > 0}
{trans 'Attachments:'}{foreach $attachments as $a} {trans 'Attachments:'}{foreach $attachments as $a}
- {$a.filename|safe} - {$a.filesize|ssize} - {$a.filename|safe} - {$a.filesize|ssize}