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

Merge branch 'develop'

Browse Source
This commit is contained in:
Loïc d'Anterroches 2010-12-23 11:57:48 +01:00
commit b4b53d3e22
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/IDF/Views/Source.php
View File

@ -299,8 +299,13 @@ class IDF_Views_Source
$rcommit = IDF_Commit::getOrAdd($cobject, $request->project); $rcommit = IDF_Commit::getOrAdd($cobject, $request->project);
$diff = new IDF_Diff($cobject->diff); $diff = new IDF_Diff($cobject->diff);
$diff->parse(); $diff->parse();
$changes = $scm->getChanges($commit);
$scmConf = $request->conf->getVal('scm', 'git'); $scmConf = $request->conf->getVal('scm', 'git');
try {
$changes = $scm->getChanges($commit);
} catch (Exception $e) {
// getChanges is not yes supported by this backend.
$changes = array();
}
$branches = $scm->getBranches(); $branches = $scm->getBranches();
$in_branches = $scm->inBranches($cobject->commit, ''); $in_branches = $scm->inBranches($cobject->commit, '');
$tags = $scm->getTags(); $tags = $scm->getTags();

4
src/IDF/templates/idf/source/commit.html
View File

@ -17,7 +17,7 @@
</tr> </tr>
<tr> <tr>
<th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br/><br/>{issuetext $cobject.full_message, $request, true, false, true, true, true}{/if}</td> <th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br/><br/>{issuetext $cobject.full_message, $request, true, false, true, true, true}{/if}</td>
</tr> </tr>{if count($changes)}
<tr> <tr>
<th><strong>{trans 'Changes:'}</strong></th> <th><strong>{trans 'Changes:'}</strong></th>
<td> <td>
@ -52,7 +52,7 @@
{/foreach} {/foreach}
</table> </table>
</td> </td>
</tr> </tr>{/if} {* End of the if count($changes) *}
</table> </table>
{if count($diff.files)} {if count($diff.files)}