Temporarily disable the change view and diff download for merge

revisions until issue 581 has been fixed properly.
This commit is contained in:
Thomas Keller 2011-02-24 13:38:42 +01:00
parent 74b44186d2
commit 58a5bc46d9

View File

@ -23,7 +23,7 @@
</tr>{/if} </tr>{/if}
<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>{if count($changes)} </tr>{if count($cobject.parents) < 2 and count($changes)}
<tr> <tr>
<th><strong>{trans 'Changes:'}</strong></th> <th><strong>{trans 'Changes:'}</strong></th>
<td> <td>
@ -61,11 +61,13 @@
</tr>{/if} {* End of the if count($changes) *} </tr>{/if} {* End of the if count($changes) *}
</table> </table>
{if count($diff.files)} {if count($cobject.parents) < 2 and count($diff.files)}
<h2>{trans 'File differences'}</h2> <h2>{trans 'File differences'}</h2>
{$diff.as_html()} {$diff.as_html()}
{/if}{if count($diff.files) or $large_commit} {/if}
{if count($cobject.parents) < 2 and (count($diff.files) or $large_commit)}
{aurl 'url', 'IDF_Views_Source::downloadDiff', array($project.shortname, $commit)} {aurl 'url', 'IDF_Views_Source::downloadDiff', array($project.shortname, $commit)}
<p class="right soft"><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom"/></a> <a href="{$url}">{trans 'Download the corresponding diff file'}</a></p> <p class="right soft"><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom"/></a> <a href="{$url}">{trans 'Download the corresponding diff file'}</a></p>
{/if} {/if}