Repository: ambari Updated Branches: refs/heads/trunk beecccea8 -> 52422ca16
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/52422ca1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52422ca1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52422ca1 Branch: refs/heads/trunk Commit: 52422ca16076843f62af71057f0ab2417bc389f8 Parents: beeccce Author: Alex Antonenko <[email protected]> Authored: Fri Oct 24 18:16:34 2014 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri Oct 24 20:04:40 2014 +0300 ---------------------------------------------------------------------- .../slider/src/main/resources/ui/app/models/slider_app.js | 5 +++-- .../src/main/resources/ui/app/views/slider_apps_view.js | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52422ca1/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 8804c18..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" -}; \ No newline at end of file + frozen: "FROZEN", + stopped: "STOPPED" +}; http://git-wip-us.apache.org/repos/asf/ambari/blob/52422ca1/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 017cf1b..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' }), @@ -171,4 +172,4 @@ App.SliderAppsView = App.TableView.extend({ App.SliderTooltip = Em.View.extend({ templateName: "common/app_tooltip" -}); \ No newline at end of file +});
