grahamc/hydra - Change JY7BXXOP3EZCDT5RSMVE4Y6IECXGYL4GEBJOZHR7H3Z35XZ3NIVQC

Split viewing and editing a project

Created by Eelco Dolstra on February 20, 2013

JY7BXXOP3EZCDT5RSMVE4Y6IECXGYL4GEBJOZHR7H3Z35XZ3NIVQC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Controller/Project.pm at line 37 [4.1245]
B:BD[4.2076] → [4.2076:2118]
```
    $c->stash->{template} = 'project.tt';
```
[4.2076]
[4.2118]
```
    $c->stash->{template} = 'edit-project.tt';
```
Replacement in src/lib/Hydra/Controller/Project.pm at line 102 [4.1245]
B:BD[4.2994] → [4.2994:3036]
```
    $c->stash->{template} = 'project.tt';
```
[4.2994]
[4.3036]
```
    $c->stash->{template} = 'edit-project.tt';
```

Insertion in src/root/common.tt at line 239 [6.2803]

[5.4168]

BLOCK editString;
  IF edit %]
    <input type="text" class="string" [% HTML.attributes(id => param, name => param, value => value) %] />
  [% ELSE;
    HTML.escape(value);
  END;
END;

File addition: edit-project.tt (----------)

[7.1486]

[% WRAPPER layout.tt title=(create ? "New Project" : "Editing project $project.name") %]
[% PROCESS common.tt %]
<form action="[% IF create %][% c.uri_for('/create-project/submit') %][% ELSE %][% c.uri_for('/project' project.name 'submit') %][% END %]" method="post">
  <table class="layoutTable">
    <tr>
      <th>Identifier:</th>
      <td><tt>[% INCLUDE editString param="name" value=project.name %]</tt></td>
    </tr>
    <tr>
      <th>Display name:</th>
      <td>[% INCLUDE editString param="displayname" value=project.displayname %]</td>
    </tr>
    <tr>
      <th>Description:</th>
      <td>[% INCLUDE editString param="description" value=project.description %]</td>
    </tr>
    <tr>
      <th>Homepage:</th>
      <td>
        [% INCLUDE editString param="homepage" value=project.homepage %]
      </td>
    </tr>
    <tr>
      <th>Owner:</th>
      <td><tt>[% INCLUDE editString param="owner" value=(project.owner.username || c.user.username) %]</tt></td>
    </tr>
    <tr>
      <th>Enabled:</th>
      <td>
        [% INCLUDE renderSelection param="enabled" curValue=project.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %]
      </td>
    </tr>
  </table>
  <div class="form-actions">
    <button type="submit" class="btn btn-primary">
      <i class="icon-ok icon-white"></i>
      [%IF create %]Create[% ELSE %]Apply changes[% END %]
    </button>
    [% IF !create %]
      <button id="delete-project" type="submit" class="btn btn-danger" name="submit" value="delete">
        <i class="icon-trash icon-white"></i>
        Delete this project
      </button>
      <script type="text/javascript">
        $("#delete-project").click(function() {
          return confirm("Are you sure you want to delete this project?");
        });
      </script>
    [% END %]
  </div>
</form>
[% END %]

Replacement in src/root/jobset.tt at line 25 [9.8409]

∅:D[8.5542] → [9.9637:9747]

∅:D[10.8025] → [9.9637:9747]

B:BD[9.9637] → [9.9637:9747]

      <tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt>

[8.5542]

[9.9747]

      <tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name %]</tt>

Replacement in src/root/jobset.tt at line 146 [9.8409]

B:BD[11.28197] → [11.28197:28486]

                              <tt>[% INCLUDE maybeEditString param="nixexprpath" value=jobset.nixexprpath extraClass="shortString" %]</tt> in input
                              <tt>[% INCLUDE maybeEditString param="nixexprinput" value=jobset.nixexprinput extraClass="shortString" %]</tt>

[11.28197]

[11.28486]

                              <tt>[% INCLUDE maybeEditString param="nixexprpath" value=jobset.nixexprpath %]</tt> in input
                              <tt>[% INCLUDE maybeEditString param="nixexprinput" value=jobset.nixexprinput %]</tt>

Replacement in src/root/project.tt at line 1 [12.1667]

B:BD[12.1667] → [3.3805:3929]

[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing project $project.name") : "Project $project.name") %]

[12.1667]

[6.3183]

[% WRAPPER layout.tt title="Project $project.name" %]

Deletion in src/root/project.tt at line 3 [12.1667]

B:BD[6.3207] → [13.397:431]

∅:D[13.431] → [11.31371:31402]

B:BD[11.31371] → [11.31371:31402]

B:BD[11.31402] → [3.3930:4033]

∅:D[13.534] → [11.31489:31750]

∅:D[3.4033] → [11.31489:31750]

B:BD[11.31489] → [11.31489:31750]

∅:D[14.25997] → [15.3166:3167]

∅:D[11.31750] → [15.3166:3167]

B:BD[15.3166] → [15.3166:3167]

B:BD[15.3167] → [16.8434:8469]

B:BD[16.8469] → [11.31751:31838]

B:BD[11.31880] → [11.31880:32166]

∅:D[11.32166] → [17.708:736]

B:BD[14.26215] → [17.708:736]

B:BD[17.736] → [11.32167:32314]

∅:D[11.32314] → [18.202:249]

B:BD[14.26299] → [18.202:249]

B:BD[18.249] → [11.32315:32473]

∅:D[11.32473] → [19.1592:1642]

B:BD[20.118] → [19.1592:1642]

B:BD[19.1642] → [11.32474:32673]

∅:D[11.32673] → [17.737:823]

B:BD[14.26538] → [17.737:823]

B:BD[17.823] → [19.1643:1726]

∅:D[19.1726] → [17.912:977]

B:BD[17.912] → [17.912:977]

B:BD[17.977] → [19.1727:1815]

∅:D[19.1815] → [17.1060:1158]

B:BD[17.1060] → [17.1060:1158]

B:BD[17.1158] → [19.1816:1907]

∅:D[19.1907] → [17.1248:1281]

B:BD[17.1248] → [17.1248:1281]

B:BD[17.1281] → [19.1908:1993]

∅:D[19.1993] → [17.1365:1421]

B:BD[17.1365] → [17.1365:1421]

B:BD[17.1421] → [11.32674:32855]

∅:D[11.32855] → [17.1422:1508]

B:BD[14.26677] → [17.1422:1508]

B:BD[17.1508] → [18.250:468]

B:BD[18.468] → [16.8589:8633]

∅:D[16.8633] → [18.507:556]

B:BD[18.507] → [18.507:556]

B:BD[18.556] → [16.8634:8694]

∅:D[16.8694] → [18.598:647]

B:BD[18.598] → [18.598:647]

B:BD[18.647] → [16.8695:8753]

∅:D[16.8753] → [21.0:51]

B:BD[18.692] → [21.0:51]

B:BD[21.51] → [16.8754:8812]

∅:D[16.8812] → [18.792:850]

B:BD[18.792] → [18.792:850]

B:BD[18.850] → [16.8813:9357]

∅:D[16.9357] → [18.965:1028]

B:BD[18.965] → [18.965:1028]

B:BD[18.1028] → [16.9358:9447]

∅:D[16.9447] → [18.1109:1165]

B:BD[18.1109] → [18.1109:1165]

B:BD[18.1165] → [11.32856:33032]

        <ul class="nav nav-tabs">
                [% IF !edit %]
                        <li class="active"><a href="#tabs-project" data-toggle="tab">Overview</a></li>
                [% END %]
                <li><a href="#tabs-settings" data-toggle="tab">Settings</a></li>
                [% IF !edit %]
                        <li><a href="#tabs-views" data-toggle="tab">Views</a></li>
                [% END %]
        </ul>
        <div class="tab-content">
        [% IF !edit %]
                <div id="tabs-project" class="tab-pane active">
                        [% IF project.jobsets.size > 0 %]
                        <p>This project has the following jobsets:</p>
                        <table class="tablesorter table table-striped table-condensed">
                          <thead>
                            <tr>
                  <th></th>
                              <th>Id</th>
                              <th>Description</th>
                              <th>Last evaluated</th>
                  <th colspan="2">Success</th>
                            </tr>
                          </thead>
                          <tbody>
                            [% FOREACH j IN jobsets %]
                            [% successrate = 0 %]
                            <tr class="clickable [% IF odd %] odd [% END; odd = !odd %]"
                                onclick="window.location = '[% c.uri_for('/jobset' project.name j.name) %]'">
                  <td>
                      [% IF j.get_column('nrscheduled') > 0 %]
                          <img src="/static/images/help_16.png" alt="Scheduled" />
                      [% ELSIF j.get_column('nrfailed') == 0  %]
                          <img src="/static/images/checkmark_16.png" alt="Succeeded" />
                      [% ELSIF j.get_column('nrfailed') > 0 && j.get_column('nrsucceeded') > 0 %]
                          <img src="/static/images/error_some_16.png" alt="Some Failed" />
                      [% ELSE %]
                          <img src="/static/images/error_16.png" alt="All Failed" />
                      [% END %]
                  </td>
                              <td>[% INCLUDE renderJobsetName project = project.name jobset = j.name %]</td>
                              <td>[% HTML.escape(j.description) %]</td>
                  <td>[% INCLUDE renderDateTime timestamp = j.lastcheckedtime %]</td>
                  [% IF j.get_column('nrtotal') > 0 %]
                    [% successrate = ( j.get_column('nrsucceeded') / j.get_column('nrtotal') )*100 %]
                    [% IF j.get_column('nrscheduled') > 0 %]
                      [% class = 'label' %]
                    [% ELSIF successrate < 25 %]
                      [% class = 'label label-important' %]
                    [% ELSIF successrate < 75 %]
                      [% class = 'label label-warning' %]
                    [% ELSIF successrate <= 100 %]
                      [% class = 'label label-success' %]
                    [% END %]
                  [% END %]
                  <td>
                      <span class="[% class %]">[% successrate FILTER format('%d') %]%</span>
                  </td>
                  <td>
                      [% IF j.get_column('nrsucceeded') > 0 %]
                      <span class="label label-success">[% j.get_column('nrsucceeded') %]</span>
                      [% END %]
                      [% IF j.get_column('nrfailed') > 0 %]
                      <span class="label label-important">[% j.get_column('nrfailed') %]</span>
                      [% END %]
                      [% IF j.get_column('nrscheduled') > 0 %]
                      <span class="label label">[% j.get_column('nrscheduled') %]</span>
                      [% END %]
                  </td>
                            </tr>
                            [% END %]
                          </tbody>
                        </table>
                        [% ELSE %]

Replacement in src/root/project.tt at line 4 [12.1667]

B:BD[11.33033] → [11.33033:33098]

                        <p>No jobsets have been defined yet.</p>

[11.33033]

[11.33098]

<ul class="nav nav-tabs">
  <li class="active"><a href="#tabs-project" data-toggle="tab">Jobsets</a></li>
  <li><a href="#tabs-settings" data-toggle="tab">Configuration</a></li>
  <li><a href="#tabs-views" data-toggle="tab">Views</a></li>
</ul>

Replacement in src/root/project.tt at line 10 [12.1667]
B:BD[11.33099] → [11.33099:33133]
```
                        [% END %]
```
[11.33099]
[11.33133]
```
<div class="tab-content">
```

Insertion in src/root/project.tt at line 12 [12.1667]

[11.33134]

  <div id="tabs-project" class="tab-pane active">
    [% IF project.jobsets.size > 0 %]
      <p>This project has the following jobsets:</p>

Replacement in src/root/project.tt at line 16 [12.1667]

B:BD[11.33135] → [11.33135:33458]

                </div>
        [% END %]
        <div id="tabs-settings" class="tab-pane [% IF edit %]active[% END %]">
                [% IF edit %]
                  <form action="[% IF create %][% c.uri_for('/create-project/submit') %][% ELSE %][% c.uri_for('/project' project.name 'submit') %][% END %]" method="post">

[11.33135]

[11.33458]

      <table class="tablesorter table table-striped table-condensed">
        <thead>
          <tr>
            <th></th>
            <th>Id</th>
            <th>Description</th>
            <th>Last evaluated</th>
            <th colspan="2">Success</th>
          </tr>
        </thead>
        <tbody>
          [% FOREACH j IN jobsets %]
            [% successrate = 0 %]
            <tr class="clickable [% IF odd %] odd [% END; odd = !odd %]"
                onclick="window.location = '[% c.uri_for('/jobset' project.name j.name) %]'">
              <td>
                [% IF j.get_column('nrscheduled') > 0 %]
                  <img src="/static/images/help_16.png" alt="Scheduled" />
                [% ELSIF j.get_column('nrfailed') == 0  %]
                  <img src="/static/images/checkmark_16.png" alt="Succeeded" />
                [% ELSIF j.get_column('nrfailed') > 0 && j.get_column('nrsucceeded') > 0 %]
                  <img src="/static/images/error_some_16.png" alt="Some Failed" />
                [% ELSE %]
                  <img src="/static/images/error_16.png" alt="All Failed" />

Replacement in src/root/project.tt at line 41 [12.1667]

B:BD[11.33485] → [11.33485:33486]

B:BD[11.33524] → [11.33524:35416]


                <table class="layoutTable">
                  [% IF edit %]
                  <tr>
                    <th>Identifier:</th>
                    <td><tt>[% INCLUDE maybeEditString param="name" value=project.name %]</tt></td>
                  </tr>
                  [% END %]
                  <tr>
                    <th>Display name:</th>
                    <td>[% INCLUDE maybeEditString param="displayname" value=project.displayname %]</td>
                  </tr>
                  <tr>
                    <th>Description:</th>
                    <td>[% INCLUDE maybeEditString param="description" value=project.description %]</td>
                  </tr>
                  <tr>
                    <th>Homepage:</th>
                    <td>
                      [% IF edit %]
                        [% INCLUDE maybeEditString param="homepage" value=project.homepage %]
                      [% ELSE %]
                        [% IF project.homepage %]
                          <a [% HTML.attributes(href => project.homepage) %]>[% HTML.escape(project.homepage) %]</a>
                        [% ELSE %]
                          <em>(not specified)</em>
                        [% END %]
                      [% END %]
                    </td>
                  </tr>
                  <tr>
                    <th>Owner:</th>
                    <td><tt>[% INCLUDE maybeEditString param="owner" value=(project.owner.username || c.user.username) edit=(edit && c.check_user_roles('admin')) %]</tt></td>
                  </tr>
                  <tr>
                    <th>Enabled:</th>
                    <td>
                      [% INCLUDE renderSelection param="enabled" curValue=project.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %]
                    </td>
                  </tr>
                </table>
                [% IF edit %]

[11.33484]

[11.35416]

              </td>
              <td>[% INCLUDE renderJobsetName project = project.name jobset = j.name %]</td>
              <td>[% HTML.escape(j.description) %]</td>
              <td>[% INCLUDE renderDateTime timestamp = j.lastcheckedtime %]</td>
              [% IF j.get_column('nrtotal') > 0 %]
                [% successrate = ( j.get_column('nrsucceeded') / j.get_column('nrtotal') )*100 %]
                [% IF j.get_column('nrscheduled') > 0 %]
                  [% class = 'label' %]
                [% ELSIF successrate < 25 %]
                  [% class = 'label label-important' %]
                [% ELSIF successrate < 75 %]
                  [% class = 'label label-warning' %]
                [% ELSIF successrate <= 100 %]
                  [% class = 'label label-success' %]
                [% END %]
              [% END %]
              <td><span class="[% class %]">[% successrate FILTER format('%d') %]%</span></td>
              <td>
                [% IF j.get_column('nrsucceeded') > 0 %]
                  <span class="label label-success">[% j.get_column('nrsucceeded') %]</span>
                [% END %]
                [% IF j.get_column('nrfailed') > 0 %]
                  <span class="label label-important">[% j.get_column('nrfailed') %]</span>
                [% END %]
                [% IF j.get_column('nrscheduled') > 0 %]
                  <span class="label label">[% j.get_column('nrscheduled') %]</span>
                [% END %]
              </td>
            </tr>
          [% END %]
        </tbody>
      </table>

Replacement in src/root/project.tt at line 74 [12.1667]

B:BD[11.35417] → [3.4034:4079]

∅:D[3.4079] → [10.14689:14955]

∅:D[11.35439] → [10.14689:14955]

B:BD[10.14689] → [10.14689:14955]

B:BD[10.14955] → [11.35440:35557]

∅:D[11.35557] → [10.15058:15196]

B:BD[10.15058] → [10.15058:15196]

B:BD[10.15196] → [11.35558:35827]

∅:D[11.35827] → [10.15400:15430]

B:BD[10.15400] → [10.15400:15430]

B:BD[10.15430] → [3.4080:4105]

                  <div class="form-actions">
                    <button type="submit" class="btn btn-primary">
                      <i class="icon-ok icon-white"></i>
                      [%IF create %]Create[% ELSE %]Apply changes[% END %]
                    </button>
                    [% IF !create %]
                      <button id="delete-project" type="submit" class="btn btn-danger" name="submit" value="delete">
                        <i class="icon-trash icon-white"></i>
                        Delete this project
                      </button>
                      <script type="text/javascript">
                        $("#delete-project").click(function() {
                          return confirm("Are you sure you want to delete this project?");
                        });
                      </script>
                    [% END %]
                  </div>

[11.35417]

[11.35855]

    [% ELSE %]
      <p>No jobsets have been defined yet.</p>
    [% END %]

Replacement in src/root/project.tt at line 78 [12.1667]
∅:D[11.35856] → [10.15457:15475]
B:BD[10.15457] → [10.15457:15475]
```
          </form>
```
[11.35856]
[2.609]
```
  </div>
```

Replacement in src/root/project.tt at line 80 [12.1667]

B:BD[2.610] → [2.610:636]

                [% END %]

[2.610]

[15.3196]

  <div id="tabs-settings" class="tab-pane">
    <table class="layoutTable">
      <tr>
        <th>Display name:</th>
        <td>[% HTML.escape(project.displayname) %]</td>
      </tr>
      <tr>
        <th>Description:</th>
        <td>[% HTML.escape(project.description) %]</td>
      </tr>
      <tr>
        <th>Homepage:</th>
        <td>
          [% IF project.homepage %]
            <a [% HTML.attributes(href => project.homepage) %]>[% HTML.escape(project.homepage) %]</a>
          [% ELSE %]
            <em>(not specified)</em>
          [% END %]
        </td>
      </tr>
      <tr>
        <th>Owner:</th>
        <td><tt>[% HTML.escape(project.owner.username) %]</tt></td>
      </tr>
      <tr>
        <th>Enabled:</th>
        <td>[% project.enabled ? "Yes" : "No" %]</td>
      </tr>
    </table>
  </div>

Replacement in src/root/project.tt at line 111 [12.1667]
B:BD[15.3197] → [11.35857:35872]
```
        </div>
```
[15.3197]
[11.35872]
```
  <div id="tabs-views" class="tab-pane">
```

Replacement in src/root/project.tt at line 113 [12.1667]

B:BD[11.35873] → [11.35873:35951]

        [% IF !edit %]
                <div id="tabs-views" class="tab-pane">

[11.35873]

[11.35951]

    [% IF views.size > 0 %]

Replacement in src/root/project.tt at line 115 [12.1667]

B:BD[11.35992] → [11.35992:36040]

                        [% IF views.size > 0 %]

[11.35952]

[11.36040]

      <p>Project <tt>[% project.name %]</tt> has the following views:</p>

Replacement in src/root/project.tt at line 117 [12.1667]

B:BD[11.36041] → [11.36041:36133]

                        <p>Project <tt>[% project.name %]</tt> has the following views:</p>

[11.36041]

[11.36133]

      <ul>
        [% FOREACH view IN views %]
          <li>
            <a href="[% c.uri_for('/view' project.name view.name) %]"><tt>[% view.name %]</tt></a>
            <a class="btn btn-mini" href="[% c.uri_for('/view' project.name view.name "edit") %]">Edit</a>
          </li>
        [% END %]
      </ul>

Replacement in src/root/project.tt at line 126 [12.1667]

B:BD[11.36134] → [11.36134:36367]

∅:D[11.36367] → [10.15476:15601]

B:BD[14.29686] → [10.15476:15601]

B:BD[10.15601] → [11.36368:36468]

                        <ul>
                          [% FOREACH view IN views %]
                            <li>
                              <a href="[% c.uri_for('/view' project.name view.name) %]"><tt>[% view.name %]</tt></a>
                              <a class="btn btn-mini" href="[% c.uri_for('/view' project.name view.name "edit") %]">Edit</a>
                            </li>
                          [% END %]
                        </ul>

[11.36134]

[11.36468]

    [% ELSE %]

Replacement in src/root/project.tt at line 128 [12.1667]

B:BD[11.36469] → [11.36469:36504]

                        [% ELSE %]

[11.36469]

[11.36504]

      <p>Project <tt>[% project.name %]</tt> has no views.</p>

Replacement in src/root/project.tt at line 130 [12.1667]

B:BD[11.36505] → [11.36505:36586]

                        <p>Project <tt>[% project.name %]</tt> has no views.</p>

[11.36505]

[11.36586]

    [% END %]

Replacement in src/root/project.tt at line 132 [12.1667]

B:BD[11.36587] → [11.36587:36621]

                        [% END %]

[11.36587]

[11.36621]

    <p>
      <a class="btn" href="[% c.uri_for('/project' project.name 'create-view') %]"><i class="icon-plus"></i> Create a new view</a>
    </p>

Replacement in src/root/project.tt at line 136 [12.1667]

B:BD[11.36622] → [11.36622:36727]

∅:D[11.36727] → [10.15686:15789]

B:BD[10.15686] → [10.15686:15789]

                        <p><a class="btn" href="[% c.uri_for('/project' project.name 'create-view') %]">
                          <i class="icon-plus"></i> Create a new view
                        </a></p>

[11.36622]

[11.36728]

  </div>

Deletion in src/root/project.tt at line 138 [12.1667]
B:BD[11.36729] → [11.36729:36770]
```
                </div>
        [% END %]
```