Repository: aurora Updated Branches: refs/heads/master 745654b04 -> 488f29f70
Clean up instance id range display. Also remove deprecated max time until running, since it's unused by the server updater. Reviewed at https://reviews.apache.org/r/38904/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/488f29f7 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/488f29f7 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/488f29f7 Branch: refs/heads/master Commit: 488f29f7060823d206579a56d54ce13e4543d916 Parents: 745654b Author: Joshua Cohen <[email protected]> Authored: Wed Sep 30 15:07:50 2015 -0500 Committer: Joshua Cohen <[email protected]> Committed: Wed Sep 30 15:07:50 2015 -0500 ---------------------------------------------------------------------- src/main/resources/scheduler/assets/js/filters.js | 4 ++-- src/main/resources/scheduler/assets/updateSettings.html | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/488f29f7/src/main/resources/scheduler/assets/js/filters.js ---------------------------------------------------------------------- diff --git a/src/main/resources/scheduler/assets/js/filters.js b/src/main/resources/scheduler/assets/js/filters.js index bf6aef8..ac48c7f 100644 --- a/src/main/resources/scheduler/assets/js/filters.js +++ b/src/main/resources/scheduler/assets/js/filters.js @@ -73,8 +73,8 @@ auroraUI.filter('toNiceRanges', function () { return function (ranges) { - return ranges.map(function (range) { - return range.first + '-' + range.last; + return ranges.sort(function (a, b) { return a.first - b.first; }).map(function (range) { + return range.first === range.last ? '' + range.first : range.first + '-' + range.last; }).join(', '); }; }); http://git-wip-us.apache.org/repos/asf/aurora/blob/488f29f7/src/main/resources/scheduler/assets/updateSettings.html ---------------------------------------------------------------------- diff --git a/src/main/resources/scheduler/assets/updateSettings.html b/src/main/resources/scheduler/assets/updateSettings.html index 611788f..96e478c 100644 --- a/src/main/resources/scheduler/assets/updateSettings.html +++ b/src/main/resources/scheduler/assets/updateSettings.html @@ -48,16 +48,6 @@ </tr> <tr> <td> - <span class="setting-label" tooltip="Max time in ms to wait until an instance reaches RUNNING state."> - Max Waiting Time For Running - </span> - </td> - <td> - <strong>{{update.update.instructions.settings.maxWaitToInstanceRunningMs}}</strong> - </td> - </tr> - <tr> - <td> <span class="setting-label" tooltip="Min time to watch a RUNNING instance."> Min Waiting Time In Running </span>
