Repository: ambari Updated Branches: refs/heads/branch-1.7.0 41e4a8e90 -> ac20b87cc
AMBARI-7949. Slider Apps: Status filter does not contain STOPPED status (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac20b87c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac20b87c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac20b87c Branch: refs/heads/branch-1.7.0 Commit: ac20b87cc0fbf08d8582b044cf7282ab4ac0a742 Parents: 41e4a8e Author: Alex Antonenko <[email protected]> Authored: Fri Oct 24 18:13:57 2014 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri Oct 24 19:59:10 2014 +0300 ---------------------------------------------------------------------- .../views/slider/src/main/resources/ui/app/models/slider_app.js | 3 ++- .../slider/src/main/resources/ui/app/views/slider_apps_view.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ac20b87c/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js index 94be61a..3338534 100644 --- a/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js +++ b/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js @@ -189,5 +189,6 @@ App.SliderApp.Status = { new_saving: "NEW_SAVING", running: "RUNNING", submitted: "SUBMITTED", - frozen: "FROZEN" + frozen: "FROZEN", + stopped: "STOPPED" }; http://git-wip-us.apache.org/repos/asf/ambari/blob/ac20b87c/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js b/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js index 3980fdc..22f8067 100644 --- a/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js +++ b/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js @@ -29,7 +29,8 @@ App.SliderAppsView = App.TableView.extend({ App.SliderApp.Status.new, App.SliderApp.Status.new_saving, App.SliderApp.Status.running, - App.SliderApp.Status.submitted + App.SliderApp.Status.submitted, + App.SliderApp.Status.stopped, ], content: function () { @@ -119,7 +120,7 @@ App.SliderAppsView = App.TableView.extend({ return this.get('parentView.statusList'); }.property('parentView.statusList'), onChangeValue: function(){ - this.get('parentView').updateFilter(this.get('column'), this.get('value'), 'string', this.get('defaultValue')); + this.get('parentView').updateFilter(this.get('column'), this.get('value') == "STOPPED" ? "FROZEN" : this.get('value'), 'string', this.get('defaultValue')); }, emptyValue: 'All Status' }),
