added more button when many nodes are configured

ezraroi · ezraroi · commit 1ba08efd2026 · 2015-08-16T10:23:41.000+03:00
diff --git a/.classpath b/.classpath
@@ -60,6 +60,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bower.json b/bower.json
@@ -16,10 +16,10 @@
   ],
   "dependencies": {
     "json3": "~3.3.2",
-    "es5-shim": "~4.1.1",
-    "angular": "1.3.16",
-    "angular-animate": "1.3.16",
-    "angular-route": "1.3.16",
+    "es5-shim": "~4.1.10",
+    "angular": "1.3.17",
+    "angular-animate": "1.3.17",
+    "angular-route": "1.3.17",
     "angular-ui-utils": "0.2.3",
     "angular-ui-select2": "~0.0.5",
     "bootstrap": "~3.3.5",
@@ -29,18 +29,18 @@
     "ngDistinctValues": "~1.0.2",
     "d3": "~3.5.3",
     "moment": "~2.10.2",
-    "angular-bootstrap": "~0.13.0",
+    "angular-bootstrap": "~0.13.1",
     "angulartics": "~0.17.1",
     "angular-duration-filter-formatter": "~1.0.1",
     "angular-busy": "~4.1.3",
     "angular-bootstrap-switch": "~0.4.0",
-    "angular-messages": "~1.4.1"
+    "angular-messages": "~1.3.17"
   },
   "devDependencies": {
-    "angular-mocks": "1.3.16",
-    "angular-scenario": "1.3.16"
+    "angular-mocks": "1.3.17",
+    "angular-scenario": "1.3.17"
   },
   "resolutions": {
-    "angular": "~1.3.16"
+    "angular": "~1.3.17"
   }
 }
diff --git a/deployment/http-root/ajs/app/components/project_configure/projectConfigureCtrl.js b/deployment/http-root/ajs/app/components/project_configure/projectConfigureCtrl.js
@@ -2,7 +2,8 @@
     'use strict';
 
     //// JavaScript Code ////
-    function projectConfigureCtrl($timeout, $route, $scope, $log,$routeParams, ProjectsRepository, project,$location,AlertService, projects, LoginService) {
+    function projectConfigureCtrl($route, $scope, $log,$routeParams, ProjectsRepository, project, $location,
+                                  AlertService, projects, LoginService) {
         $scope.projectName = $routeParams.project_name;
         $scope.tabName = $routeParams.tab_name;
         $scope.projectConfigurationForEditing = project.cloneConfiguration();
@@ -22,6 +23,7 @@
             nodesDiscoveryAutoComplete : ['CODEINE_PROJECT_NAME','CODEINE_OUTPUT_FILE'],
             tagsAutoComplete : ['CODEINE_PROJECT_NAME','CODEINE_NODE_NAME','CODEINE_NODE_ALIAS','CODEINE_OUTPUT_FILE']
         };
+        $scope.nodeQuantity = 30;
 
         function swapItems(index,array) {
             var temp = array[index];
diff --git a/deployment/http-root/ajs/app/components/project_configure/project_configure.html b/deployment/http-root/ajs/app/components/project_configure/project_configure.html
@@ -172,7 +172,7 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <tr ng-repeat="node_info in projectConfigurationForEditing.nodes_info" ng-form="nodesInfoRow">
+                            <tr ng-repeat="node_info in projectConfigurationForEditing.nodes_info | limitTo: -nodeQuantity" ng-form="nodesInfoRow">
                                 <td class="controls col-md-3" ng-class="{'has-error': nodesInfoRow.node_name.$invalid}">
                                     <input type="text" name="node_name" class="form-control" ng-distinct-values="projectConfigurationForEditing.nodes_info" ng-model="node_info.name" required>
                                 </td>
@@ -186,12 +186,19 @@
                                     <button ng-click="removeItem(projectConfigurationForEditing.nodes_info,$index,$event)" tooltip="Remove Node" class="btn btn-default btn-mini"><i class="fa fa-times"></i></button>
                                 </td>
                             </tr>
-
                             </tbody>
                         </table>
+                        <div class="row" ng-show="projectConfigurationForEditing.nodes_info.length > nodeQuantity">
+                            <div class="col-md-12">
+                                <button ng-click="nodeQuantity = nodeQuantity + 10;" style="margin-left: 10px;"
+                                        class="btn btn-default btn-sm">More...</button>
+                            </div>
+                        </div>
+                        <br/>
                         <div class="row">
                             <div class="col-md-12">
-                                <button ng-click="addNode()" type="button" style="margin-left: 10px;" class="btn btn-info"><i class="fa fa-plus"></i> Add Node</button>
+                                <button ng-click="addNode()" type="button" style="margin-left: 10px;"
+                                        class="btn btn-info"><i class="fa fa-plus"></i> Add Node</button>
                             </div>
                             <br/><br/>
                         </div>
diff --git a/deployment/http-root/ajs/app/components/projects_list/projectsListCtrl.js b/deployment/http-root/ajs/app/components/projects_list/projectsListCtrl.js
@@ -7,7 +7,6 @@
         var vm = this;
 
         vm.selectedTabName = $routeParams.tab_name;
-        $log.debug("building tabs");
         vm.uiTabs = [];
         vm.uiTabs.push({tab:{name:'main', exp: ['.*']}, active : vm.selectedTabName === 'main'});
         _.each(tabs, function(tab) {
diff --git a/deployment/http-root/ajs/app/components/services/loginService.js b/deployment/http-root/ajs/app/components/services/loginService.js
@@ -15,7 +15,7 @@
             else {
                 deffer = $q.defer();
                 CodeineService.getSessionInfo().success(function (data) {
-                    $log.debug('LoginService: got session info ' + angular.toJson(data));
+                    $log.debug('LoginService: got session info');
                     sessionInfo = data;
                     deffer.resolve(data);
                     deffer = undefined;
diff --git a/deployment/http-root/ajs/app/images/codeine_icon.png b/deployment/http-root/ajs/app/images/codeine_icon.png
diff --git a/deployment/http-root/ajs/app/index.html b/deployment/http-root/ajs/app/index.html
@@ -48,7 +48,7 @@ <h3><i class="fa fa-spin fa-spinner fa-lg"></i> Loading Codeine...</h3>
                     </button>
                     <a class="navbar-brand" href="/">
                         <div class="navbar-brand-name">
-                            <img src="/images/codeine_16x16.png"/> {{globalConfiguration.server_name}}
+                            <img src="/images/codeine_icon.png" style="width: 16px; height: 16px"/> {{globalConfiguration.server_name}}
                         </div>
                     </a>
                 </div>
diff --git a/deployment/http-root/ajs/bower.json b/deployment/http-root/ajs/bower.json
@@ -16,10 +16,10 @@
   ],
   "dependencies": {
     "json3": "~3.3.2",
-    "es5-shim": "~4.1.1",
-    "angular": "1.3.16",
-    "angular-animate": "1.3.16",
-    "angular-route": "1.3.16",
+    "es5-shim": "~4.1.10",
+    "angular": "1.3.17",
+    "angular-animate": "1.3.17",
+    "angular-route": "1.3.17",
     "angular-ui-utils": "0.2.3",
     "angular-ui-select2": "~0.0.5",
     "bootstrap": "~3.3.5",
@@ -29,18 +29,18 @@
     "ngDistinctValues": "~1.0.2",
     "d3": "~3.5.3",
     "moment": "~2.10.2",
-    "angular-bootstrap": "~0.13.0",
+    "angular-bootstrap": "~0.13.1",
     "angulartics": "~0.17.1",
     "angular-duration-filter-formatter": "~1.0.1",
     "angular-busy": "~4.1.3",
     "angular-bootstrap-switch": "~0.4.0",
-    "angular-messages": "~1.4.1"
+    "angular-messages": "~1.3.17"
   },
   "devDependencies": {
-    "angular-mocks": "1.3.16",
-    "angular-scenario": "1.3.16"
+    "angular-mocks": "1.3.17",
+    "angular-scenario": "1.3.17"
   },
   "resolutions": {
-    "angular": "~1.3.16"
+    "angular": "~1.3.17"
   }
 }
diff --git a/src/common/codeine/db/mysql/NearestMysqlHostSelectorPreferLocalhost.java b/src/common/codeine/db/mysql/NearestMysqlHostSelectorPreferLocalhost.java
@@ -1,16 +1,14 @@
 package codeine.db.mysql;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-
 import codeine.executer.Task;
 import codeine.jsons.global.GlobalConfigurationJsonStore;
 import codeine.jsons.global.MysqlConfigurationJson;
 import codeine.utils.network.InetUtils;
+import org.apache.log4j.Logger;
+
+import javax.inject.Inject;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 public class NearestMysqlHostSelectorPreferLocalhost implements Task, MysqlHostSelector{
 
@@ -62,15 +60,7 @@ public static MysqlConfigurationJson getLocalConfOrNull(GlobalConfigurationJsonS
 		}
 		return null;
 	}
-	public MysqlConfigurationJson getLocalConf() {
-		MysqlConfigurationJson localConf = getLocalConfOrNull();
-		if (null == localConf) {
-			throw new RuntimeException("could not find mysql configuration to start with. host is " + InetUtils.getLocalHost() + " and configuration is " + conf.get().mysql());
-		}
-		return localConf;
-	}
 
-	
 	@Override
 	public String toString() {
 		return "NearestMysqlHostSelector [mysqlConf=" + mysqlConf + "]";
