Author: yusaku
Date: Sat Jan 19 01:36:20 2013
New Revision: 1435448
URL: http://svn.apache.org/viewvc?rev=1435448&view=rev
Log:
AMBARI-1224. Drop the all option from Hosts > Component Filter and Jobs > Users
Filter. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
incubator/ambari/trunk/ambari-web/app/templates/main/host/component_filter.hbs
incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js
incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1435448&r1=1435447&r2=1435448&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 19 01:36:20 2013
@@ -17,6 +17,9 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1224. Drop the "all" option from Hosts > Component Filter and
+ Jobs > Users Filter. (yusaku)
+
AMBARI-1223. Confirm Hosts page: It looks like hosts disappear if you are
on "Fail" filter and click on "Retry Failed" button. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs?rev=1435448&r1=1435447&r2=1435448&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
Sat Jan 19 01:36:20 2013
@@ -19,9 +19,6 @@
User <span class="caret"></span>
</button>
<ul class="dropdown-menu filter-components">
- <li>
- <label class="checkbox">{{view Ember.Checkbox
checkedBinding="view.allComponentsChecked"}} All</label>
- </li>
{{#each user in view.users}}
<li>
<label class="checkbox">{{view Ember.Checkbox
checkedBinding="user.checked"}} {{user.name}}</label>
Modified:
incubator/ambari/trunk/ambari-web/app/templates/main/host/component_filter.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/host/component_filter.hbs?rev=1435448&r1=1435447&r2=1435448&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/templates/main/host/component_filter.hbs
(original)
+++
incubator/ambari/trunk/ambari-web/app/templates/main/host/component_filter.hbs
Sat Jan 19 01:36:20 2013
@@ -25,11 +25,6 @@
<ul>
<li>
<label class="checkbox">
- {{view Ember.Checkbox
checkedBinding="view.allComponentsChecked"}} All
- </label>
- </li>
- <li>
- <label class="checkbox">
{{view Ember.Checkbox
checkedBinding="view.masterComponentsChecked"}} Master Components:
</label>
<ul>
Modified: incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js?rev=1435448&r1=1435447&r2=1435448&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js Sat Jan
19 01:36:20 2013
@@ -99,14 +99,6 @@ var componentFieldView = Ember.View.exte
slaveComponentsBinding: 'controller.slaveComponents',
clientComponentsBinding: 'controller.clientComponents',
- allComponentsChecked:false,
- toggleAllComponents:function () {
- var checked = this.get('allComponentsChecked');
- this.set('masterComponentsChecked', checked);
- this.set('slaveComponentsChecked', checked);
- this.set('clientComponentsChecked', checked);
- }.observes('allComponentsChecked'),
-
masterComponentsChecked:false,
toggleMasterComponents:function () {
this.get('masterComponents').setEach('checkedForHostFilter',
this.get('masterComponentsChecked'));
@@ -126,7 +118,6 @@ var componentFieldView = Ember.View.exte
* Clear filter to initial state
*/
clearFilter:function() {
- this.set('allComponentsChecked', false);
this.set('masterComponentsChecked', false);
this.set('slaveComponentsChecked', false);
this.set('clientComponentsChecked', false);
Modified: incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js?rev=1435448&r1=1435447&r2=1435448&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js Sat Jan 19
01:36:20 2013
@@ -837,19 +837,13 @@ App.MainAppsView = Em.View.extend({
return users;
}.property('parentView.users'),
templateName:require('templates/main/apps/user_filter'),
- allComponentsChecked:false,
- toggleAllComponents: function() {
- var checked = this.get('allComponentsChecked');
- this.get('users').forEach(function(item){
- item.set('checked',checked);
- });
- }.observes('allComponentsChecked'),
clickFilterButton:function(event) {
this.set('open', !this.get('open'));
},
clearFilter:function(self) {
- self.set('allComponentsChecked', true);
- self.set('allComponentsChecked', false);
+ self.get('users').forEach(function(item){
+ item.set('checked',false);
+ });
jQuery('#user_filter').val([]);
self.get('parentView').get('oTable').fnFilter('', 5);
jQuery('#user_filter').closest('th').addClass('notActive');
