svn commit: r1494394 - in /incubator/ambari/branches/branch-1.4.0/ambari-web/app: templates/main/apps.hbs views/main/apps_view.js

[yusaku]

Author: yusaku
Date: Tue Jun 18 23:59:39 2013
New Revision: 1494394

URL: http://svn.apache.org/r1494394
Log:
AMBARI-2419. Jobs page: wrong behavior for switching between All and Filtered. 
(Oleg Nechiporenko via yusaku)

Modified:
    
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
    
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js

Modified: 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs
URL: 
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs?rev=1494394&r1=1494393&r2=1494394&view=diff
==============================================================================
--- 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs 
(original)
+++ 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/apps.hbs 
Tue Jun 18 23:59:39 2013
@@ -53,7 +53,7 @@
   <div class="filter_info">
 
     <div class="span4" id="filter_buttons">{{t common.show}}:
-      <a class="all selected" {{action "clickViewType" target="view"}} 
data-view-type="all">{{t apps.filters.all}}
+      <a class="all" {{action "clickViewType" target="view"}} 
data-view-type="all">{{t apps.filters.all}}
         ({{controller.paginationObject.iTotalRecords}})</a> &#124;
       <a class="filtered" {{action "clickViewType" target="view"}} 
data-view-type="filtered">{{t apps.filters.filtered}}
         ({{controller.filterObject.filteredDisplayRecords}})</a>

Modified: 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js?rev=1494394&r1=1494393&r2=1494394&view=diff
==============================================================================
--- 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js 
(original)
+++ 
incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/apps_view.js 
Tue Jun 18 23:59:39 2013
@@ -277,6 +277,7 @@ App.MainAppsView = Em.View.extend({
    */
   didInsertElement: function(){
     App.router.get('mainAppsItemController').set('lastJobId', null);
+    this.onChangeViewType();
   },
   /**
    *