svn commit: r1397996 - in /incubator/ambari/branches/AMBARI-666: AMBARI-666-CHANGES.txt ambari-web/app/controllers/installer/step4_controller.js ambari-web/app/templates/installer/step4.hbs

[yu...@apache.org]

Author: yusaku
Date: Sun Oct 14 02:49:12 2012
New Revision: 1397996

URL: http://svn.apache.org/viewvc?rev=1397996&view=rev
Log:
AMBARI-858. Installer -> Select Services page: warning popups are no longer appearing. (yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step4_controller.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1397996&r1=1397995&r2=1397996&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Sun Oct 14 02:49:12 2012
@@ -257,6 +257,9 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-858. Installer -> Select Services page: warning popups are no longer
+  appearing. (yusaku)
+
   AMBARI-846. Select Masters Page: make ZooKeeper addition/removal UI more
   organized. (Jaimin Jetly via yusaku)
 

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step4_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step4_controller.js?rev=1397996&r1=1397995&r2=1397996&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step4_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step4_controller.js Sun Oct 14 02:49:12 2012
@@ -58,38 +58,6 @@ App.InstallerStep4Controller = Em.ArrayC
     return db.getService();
   },
 
-  /*
-  loadStepFromContent: function () {
-    console.log("TRACE: Loading from rawContent/API step4: Choose Services");
-    this.clear();
-    var rawContent = this.rawContent;
-    rawContent.setEach('isSelected', true);
-    this.renderStep(rawContent);
-  },
-  */
-
-  /*
-  loadStepFromDb: function () {
-    console.log("TRACE: Loading form localStorage step4: Choose Services");
-    this.clear();
-    var rawContent = this.rawContent;
-    rawContent.setEach('isSelected', false);
-    var services = App.db.getSelectedServiceNames();
-    if (services !== undefined && services !== null) {
-      rawContent.forEach(function (_content) {
-        var serviceFound = services.contains(_content.serviceName);
-        if (serviceFound) {
-          _content.isSelected = true;
-        } else {
-          _content.isSelected = false;
-        }
-        console.log('TRACE: value of service is: ' + _content.serviceName);
-      });
-      this.renderStep(rawContent);
-    }
-  },
-  */
-
   renderStep: function (serviceInfo) {
     serviceInfo.forEach(function (item) {
       this.pushObject(Ember.Object.create(item));

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs?rev=1397996&r1=1397995&r2=1397996&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs Sun Oct 14 02:49:12 2012
@@ -51,6 +51,6 @@
 
   <div class="btn-area">
     <a class="btn pull-left" {{action back}}>&larr; Back</a>
-    <a class="btn btn-success pull-right" {{action proceed target="controller"}}>Next &rarr;</a>
+    <a class="btn btn-success pull-right" {{action submit target="controller"}}>Next &rarr;</a>
   </div>
 </div>
\ No newline at end of file