Branch: refs/heads/master
Home: https://github.com/mono/monkeywrench
Compare: https://github.com/mono/monkeywrench/compare/02d27d9cf9f0...d1a7afabad4a
Commit: 0224301bffcbd418ccfe8c07d47a5702535e663e
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 12:01:17 GMT
URL: https://github.com/mono/monkeywrench/commit/0224301bffcbd418ccfe8c07d47a5702535e663e
[WorkTable] Fix issue with starttime and duration for ignored build.
Changed paths:
M MonkeyWrench.Web.UI/ViewWorkTable.aspx.cs
Modified: MonkeyWrench.Web.UI/ViewWorkTable.aspx.cs
===================================================================
@@ -117,14 +117,14 @@ public string GenerateLane (GetViewWorkTableDataResponse response, DBLane lane,
matrix.AppendFormat ("\t<td class='{0}'><a href='ViewLane.aspx?lane_id={2}&host_id={3}&revision_id={4}'>{1}</a></td>", result, view.revision, lane.id, host.id, view.revision_id);
- if (state > DBState.NotDone && state != DBState.Paused) {
+ if (state > DBState.NotDone && state != DBState.Paused && state != DBState.Ignore) {
matrix.AppendFormat ("<td>{0}</td>", view.starttime.ToString ("yyyy/MM/dd HH:mm:ss UTC"));
} else {
matrix.AppendLine ("<td>-</td>");
}
// duration
matrix.Append ("\t<td>");
- if (state >= DBState.Executing && state != DBState.Paused) {
+ if (state >= DBState.Executing && state != DBState.Paused && state != DBState.Ignore) {
matrix.Append ("[");
matrix.Append (MonkeyWrench.Utilities.GetDurationFromWorkView (view).ToString ());
matrix.Append ("]");
Commit: d1a7afabad4a68e0003a8679030b37b0fb0387de
Author: Rolf Bjarne Kvinge <[email protected]> (rolfbjarne)
Date: 2013-10-24 12:57:20 GMT
URL: https://github.com/mono/monkeywrench/commit/d1a7afabad4a68e0003a8679030b37b0fb0387de
Merge pull request #6 from Therzok/master
[WorkTable] Fix issue with starttime and duration for ignored build.
Changed paths:
M MonkeyWrench.Web.UI/ViewWorkTable.aspx.cs
Modified: MonkeyWrench.Web.UI/ViewWorkTable.aspx.cs
===================================================================
@@ -117,14 +117,14 @@ public string GenerateLane (GetViewWorkTableDataResponse response, DBLane lane,
matrix.AppendFormat ("\t<td class='{0}'><a href='ViewLane.aspx?lane_id={2}&host_id={3}&revision_id={4}'>{1}</a></td>", result, view.revision, lane.id, host.id, view.revision_id);
- if (state > DBState.NotDone && state != DBState.Paused) {
+ if (state > DBState.NotDone && state != DBState.Paused && state != DBState.Ignore) {
matrix.AppendFormat ("<td>{0}</td>", view.starttime.ToString ("yyyy/MM/dd HH:mm:ss UTC"));
} else {
matrix.AppendLine ("<td>-</td>");
}
// duration
matrix.Append ("\t<td>");
- if (state >= DBState.Executing && state != DBState.Paused) {
+ if (state >= DBState.Executing && state != DBState.Paused && state != DBState.Ignore) {
matrix.Append ("[");
matrix.Append (MonkeyWrench.Utilities.GetDurationFromWorkView (view).ToString ());
matrix.Append ("]");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.