ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

* Renaming "release sets" to "views" (not finished yet). Having

Browse Source 
releases as a dynamic view on the database was misguided, since
  doing thing like adding a new job to a release set will invalidate
  all old releases.  So we rename release sets to views, and we'll
  reintroduce releases as separate, static entities in the database.
This commit is contained in:
Eelco Dolstra
2009-10-15 21:35:19 +00:00
parent 3ebe5e1069
commit cec3201720
29 changed files with 351 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/root/edit-releaseset.tt → src/root/edit-view.tt
View File

@ -1,8 +1,8 @@
[% WRAPPER layout.tt title=(create ? "New Release Set" : "Release Set ‘$project.name:$releaseSet.name’") %]
[% WRAPPER layout.tt title=(create ? "New View" : "View ‘$project.name:$view.name’") %]
[% PROCESS common.tt %]
[% USE HTML %]
<h1>[% IF create %]New Release Set[% ELSE %]Release Set <tt>[% project.name %]:[% releaseSet.name %]</tt>[% END %]</h1>
<h1>[% IF create %]New View[% ELSE %]View <tt>[% project.name %]:[% view.name %]</tt>[% END %]</h1>
[% BLOCK renderJob %]
@ -21,16 +21,16 @@
[% END %]
<form action="[% IF create %][% c.uri_for('/create_releaseset' project.name 'submit') %][% ELSE %][% c.uri_for('/releases' project.name releaseSet.name 'submit') %][% END %]" method="post">
<form action="[% IF create %][% c.uri_for('/create-view' project.name 'submit') %][% ELSE %][% c.uri_for('/view' project.name view.name 'submit') %][% END %]" method="post">
<table class="layoutTable">
<tr>
<th>Identifier:</th>
<td><input type="text" class="string" name="name" [% HTML.attributes(value => releaseSet.name) %] /></td>
<td><input type="text" class="string" name="name" [% HTML.attributes(value => view.name) %] /></td>
</tr>
<tr>
<th>Description:</th>
<td><input type="text" class="string" name="description" [% HTML.attributes(value => releaseSet.description) %] /></td>
<td><input type="text" class="string" name="description" [% HTML.attributes(value => view.description) %] /></td>
</tr>
</table>
@ -86,13 +86,13 @@
[% IF !create %]
<form action="[% c.uri_for('/releases' project.name releaseSet.name 'delete') %]" method="post">
<p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this release set</button></p>
<form action="[% c.uri_for('/view' project.name view.name 'delete') %]" method="post">
<p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this view</button></p>
</form>
<script type="text/javascript">
$("#delete-project").click(function() {
return confirm("Are you sure you want to delete this release set?");
return confirm("Are you sure you want to delete this view?");
});
</script>

16
src/root/project.tt
View File

@ -99,28 +99,28 @@
<h2>Releases</h2>
<h2>Views</h2>
[% IF releaseSets.size > 0 %]
[% IF views.size > 0 %]
<p>Project <tt>[% project.name %]</tt> has the following release sets:</p>
<p>Project <tt>[% project.name %]</tt> has the following views:</p>
<ul>
[% FOREACH releaseSet IN releaseSets %]
[% FOREACH view IN views %]
<li>
<a href="[% c.uri_for('/releases' project.name releaseSet.name) %]"><tt>[% releaseSet.name %]</tt></a>
[<a href="[% c.uri_for('/releases' project.name releaseSet.name "edit") %]">Edit</a>]
<a href="[% c.uri_for('/view' project.name view.name) %]"><tt>[% view.name %]</tt></a>
[<a href="[% c.uri_for('/view' project.name view.name "edit") %]">Edit</a>]
</li>
[% END %]
</ul>
[% ELSE %]
<p>Project <tt>[% project.name %]</tt> has no release sets.</p>
<p>Project <tt>[% project.name %]</tt> has no views.</p>
[% END %]
<p><a href="[% c.uri_for('/create_releaseset' project.name) %]">[Create a new release set]</a></p>
<p><a href="[% c.uri_for('/project' project.name 'create-view') %]">[Create a new view]</a></p>
<h2>Channels</h2>

75
src/root/releases.tt
View File

@ -1,75 +0,0 @@
[% WRAPPER layout.tt title="Release Set ‘$releaseSet.project.name:$releaseSet.name’" %]
[% PROCESS common.tt %]
[% USE HTML %]
<h1>Release Set <tt>[% releaseSet.project.name %]:[% releaseSet.name %]</tt></h1>
<p>
[<a href="[% c.uri_for('/releases' project.name releaseSet.name "edit") %]">Edit</a>]
[<a href="[% c.uri_for('/release' project.name releaseSet.name "latest") %]">Latest</a>]
</p>
<p>Showing releases [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + releases.size %] out of [% totalReleases %].</p>
<table class="tablesorter">
<thead>
<tr>
<th></th>
<th>#</th>
<th>Release</th>
<th>Date</th>
[% FOREACH j IN jobs %]
<th class="releaseSetJobName">[% INCLUDE renderReleaseJobName job=j %]</th>
[% END %]
</tr>
</thead>
<tbody>
[% FOREACH release IN releases %]
[% link = c.uri_for('/release' releaseSet.project.name releaseSet.name release.id) %]
<tr class="clickable" onclick="window.location = '[% link %]'">
<td>
[% IF release.status == 0 %]
<img src="/static/images/success.gif" />
[% ELSIF release.status == 1 %]
<img src="/static/images/failure.gif" />
[% ELSIF release.status == 2 %]
<img src="/static/images/question-mark.png" />
[% END %]
</td>
<td><a href="[% link %]">[% release.id %]</a></td>
<td>
[% IF release.releasename %]
<tt>[% release.releasename %]</tt>
[% ELSE %]
<em>No name</em>
[% END %]
</td>
<td>[% INCLUDE renderDateTime timestamp=release.timestamp %]</td>
[% FOREACH j IN release.jobs %]
<td class="centered">
[% IF j.build %]
<a href="[% c.uri_for('/build' j.build.id) %]">
[% IF j.build.get_column('buildstatus') == 0 %]
<img src="/static/images/success.gif" />
[% ELSE %]
<img src="/static/images/failure.gif" />
[% END %]
</a>
[% END %]
</td>
[% END %]
</tr>
[% END %]
</tbody>
</table>
[% IF page > 1 %]
[<a href="[% "$baseUri/"; (page - 1) %]">Prev</a>]
[% END %]
[% IF page * resultsPerPage < totalReleases %]
[<a href="[% "$baseUri/"; (page + 1) %]">Next</a>]
[% END %]
[<a href="[% "$baseUri/"; (totalReleases - 1) div resultsPerPage + 1 %]">Last</a>]
[% END %]

76
src/root/view.tt Normal file
View File

@ -0,0 +1,76 @@
[% WRAPPER layout.tt title="View ‘$view.project.name:$view.name’" %]
[% PROCESS common.tt %]
[% USE HTML %]
<h1>View <tt>[% view.project.name %]:[% view.name %]</tt></h1>
<p>
[<a href="[% c.uri_for('/view' project.name view.name "edit") %]">Edit</a>]
[<a href="[% c.uri_for('/view' project.name view.name "latest") %]">Latest</a>]
</p>
<p>Showing results [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + results.size %] out of [% totalResults %].</p>
<table class="tablesorter">
<thead>
<tr>
<th></th>
<th>#</th>
<th>Name</th>
<th>Date</th>
[% FOREACH j IN jobs %]
<th class="releaseSetJobName">[% INCLUDE renderReleaseJobName job=j %]</th>
[% END %]
</tr>
</thead>
<tbody>
[% FOREACH result IN results %]
[% link = c.uri_for('/view' project.name view.name result.id) %]
<tr class="clickable" onclick="window.location = '[% link %]'">
<td>
[% IF result.status == 0 %]
<img src="/static/images/success.gif" />
[% ELSIF result.status == 1 %]
<img src="/static/images/failure.gif" />
[% ELSIF result.status == 2 %]
<img src="/static/images/question-mark.png" />
[% END %]
</td>
<td><a href="[% link %]">[% result.id %]</a></td>
<td>
[% IF result.releasename %]
<tt>[% result.releasename %]</tt>
[% ELSE %]
<em>No name</em>
[% END %]
</td>
<td>[% INCLUDE renderDateTime timestamp=result.timestamp %]</td>
[% FOREACH j IN result.jobs %]
<td class="centered">
[% IF j.build %]
<a href="[% c.uri_for('/build' j.build.id) %]">
[% IF j.build.get_column('buildstatus') == 0 %]
<img src="/static/images/success.gif" />
[% ELSE %]
<img src="/static/images/failure.gif" />
[% END %]
</a>
[% END %]
</td>
[% END %]
</tr>
[% END %]
</tbody>
</table>
[<a href="[% "$baseUri?page=1" %]">First</a>]
[% IF page > 1 %]
[<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
[% END %]
[% IF page * resultsPerPage < totalResults %]
[<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
[% END %]
[<a href="[% "$baseUri?page="; (totalResults - 1) div resultsPerPage + 1 %]">Last</a>]
[% END %]