Merge pull request #50 from amitmawkin/master

Fixed another bug with SourceControl widget
hygieia · Aug 8, 2015 · c68101d · c68101d
2 parents 0124e77 + 3d0f886
commit c68101d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/UI/src/app/dashboard/directives/widget.js b/UI/src/app/dashboard/directives/widget.js
@@ -124,7 +124,6 @@
                 console.log($scope.owner);
                 if ($scope.owner == $cookies.username || $cookies.username == "admin")
                 {
-                    console.log("Yeah you are the owner");
                     configModal();
                 }
                 else

diff --git a/UI/src/components/widgets/repo/config.js b/UI/src/components/widgets/repo/config.js
@@ -21,42 +21,35 @@
 			value: 'Subversion'
 		}];
 
+console.log(JSON.stringify(widgetConfig)); //"{"options":{"id":"repo0"}}"
+		console.log(JSON.stringify(widgetConfig.options.id));
 
-		var myindex;
-
-		for (var v = 0; v < ctrl.repoOptions.length; v++) {
-			console.log(v+ctrl.repoOptions[v].name);
+		if (!widgetConfig.options.scm) {
+			ctrl.repoOption="";
+		}
+		else
+		{
+			var myindex;
 
-			if(ctrl.repoOptions[v].name == widgetConfig.options.scm.name)
-			{
-				myindex = v;
+			for (var v = 0; v < ctrl.repoOptions.length; v++) {
+				if (ctrl.repoOptions[v].name == widgetConfig.options.scm.name) {
+					myindex = v;
+				}
 			}
+			ctrl.repoOption=ctrl.repoOptions[myindex];
 		}
 
 
-		console.log("index is" + myindex);
-
-		ctrl.repoOption=ctrl.repoOptions[myindex];
 		ctrl.gitBranch = widgetConfig.options.branch;
 		ctrl.username = "";
 		ctrl.password = "";
-		ctrl.selectedOption=widgetConfig.options.scm.name;
+
 
 		// public variables
 		ctrl.submitted = false;
 		ctrl.collectors = [];
 		ctrl.repoUrl = widgetConfig.options.url;
 
-
-		console.log(JSON.stringify(widgetConfig.options));
-
-
-
-
-
-
-
-
 		// public methods
 		ctrl.submit = submitForm;