Indefero Commit Details

Date:

2009-05-26 14:59:02 (16 years 5 months ago)

Author:

Loic d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

54b37ac5b61b8e201ca1228a798768d5a0f27dc5

Parents:

bc434504b177ac0dfedee0cbded44971d85c208e

Message:

Fixed issue 226, branches are displayed only on source tree view.

Changes:

File differences

-274
275 275
276 276
277
277 278
278 279
279 280
... ...
282 283
283 284
284 285
286
285 287
286 288
287 289
+        $diff = new IDF_Diff($cobject->changes);␊
        $diff->parse();␊
        $scmConf = $request->conf->getVal('scm', 'git');␊
        $in_branches = $scm->inBranches($commit, '');␊
        return Pluf_Shortcuts_RenderToResponse('idf/source/commit.html',␊
                                               array(␊
                                                     'page_title' => $page_title,␊

                                                     'cobject' => $cobject,␊
                                                     'commit' => $commit,␊
                                                     'branches' => $branches,␊
                                                     'tree_in' => $in_branches,␊
                                                     'scm' => $scmConf,␊
                                                     'rcommit' => $rcommit,␊
                                                     'large_commit' => $large,␊
 ...
         $diff = new IDF_Diff($cobject->changes);␊
         $diff->parse();␊
         $scmConf = $request->conf->getVal('scm', 'git');␊
+        $in_branches = $scm->inBranches($commit, '');␊
         return Pluf_Shortcuts_RenderToResponse('idf/source/commit.html',␊
                                                array(␊
                                                      'page_title' => $page_title,␊
                                                      'cobject' => $cobject,␊
                                                      'commit' => $commit,␊
                                                      'branches' => $branches,␊
+                                                     'tree_in' => $in_branches,␊
                                                      'scm' => $scmConf,␊
                                                      'rcommit' => $rcommit,␊
                                                      'large_commit' => $large,␊

-38
39 39
40 40
41 
41
42 42
43 
44 
45 
43
44
45
46 46
47 47
48
49
50
51
52
53
54
55
48 56
49 57
50 58
+␊
{/block}␊
{block context}␊
{if $scm == 'git'}␊
{if $scm != 'svn'}␊
<p><strong>{trans 'Branches:'}</strong><br />␊
{foreach $branches as $branch}␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $branch)}␊
<span class="label{if $commit == $branch} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
{foreach $branches as $branch => $path}␊
{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}␊
<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
{/foreach}␊
</p>␊
{else}␊
<form class="star" action="{url 'IDF_Views_Source_Svn::changelogRev', array($project.shortname)}" method="get">␊
<p><strong>{trans 'Revision:'}</strong> {$commit}</p>␊
<p>␊
    <input accesskey="4" type="text" value="{$commit}" name="rev" size="5" />␊
    <input type="submit" name="s" value="{trans 'Go to revision'}" />␊
</p>␊
</form>␊
{/if}␊
{/block}␊
␊
 ␊
 {/block}␊
 {block context}␊
-{if $scm == 'git'}␊
+{if $scm != 'svn'}␊
 <p><strong>{trans 'Branches:'}</strong><br />␊
-{foreach $branches as $branch}␊
-{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $branch)}␊
-<span class="label{if $commit == $branch} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
+{foreach $branches as $branch => $path}␊
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}␊
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />␊
 {/foreach}␊
 </p>␊
+{else}␊
+<form class="star" action="{url 'IDF_Views_Source_Svn::changelogRev', array($project.shortname)}" method="get">␊
+<p><strong>{trans 'Revision:'}</strong> {$commit}</p>␊
+<p>␊
+    <input accesskey="4" type="text" value="{$commit}" name="rev" size="5" />␊
+    <input type="submit" name="s" value="{trans 'Go to revision'}" />␊
+</p>␊
+</form>␊
 {/if}␊
 {/block}␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags