Fixed bug that manage page reload when description is clicked

whsatku · Oct 14, 2015 · aa0ad49 · aa0ad49
1 parent 54717a1
commit aa0ad49
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/ui/static/app/group.js b/ui/static/app/group.js
@@ -53,6 +53,15 @@ app.controller('GroupManageController', function($scope, $http, $location){
     }
     $scope.acceptMember = acceptMember;
     $scope.denyMember = denyMember;
+
+    $http.get('/api/group/'+groupID).then(function(data){
+        $scope.group = data.data;
+    });
+
+    $scope.editInfo = function(){
+        $http.put('/api/group/'+groupID+'/edit/',$scope.group).success(function(data){
+        });
+    }
 })
 
 
@@ -63,20 +72,5 @@ app.controller('GroupCategoryController', function($scope, $http, $stateParams){
     });
 
 });
-
-
-app.controller('AdminPageController', function($scope, $http, $location){
-    var groupID = $location.path().split('/')[2];
-
-    $http.get('/api/group/'+groupID).then(function(data){
-        $scope.group = data.data;
-    });
-    $scope.editInfo = function(){
-        console.log("type: "+$scope.group)
-        $http.put('/api/group/'+groupID+'/edit/',$scope.group).success(function(data){
-                   });
-    }
-
-})
 
 })();
diff --git a/ui/static/app/main.js b/ui/static/app/main.js
@@ -44,11 +44,6 @@ app.config(function($stateProvider, $urlRouterProvider) {
 			templateUrl: 'templates/groupmanage.html',
 			controller: 'GroupManageController'
 		})
-		.state('root.group.edit', {
-			url: '/edit',
-			templateUrl: 'templates/groupmanage.html',
-			controller: 'AdminPageController'
-		})
 		.state('root.lfg', {
 			url: '/groups/browse',
 			templateUrl: 'templates/groupbrowser.html',

diff --git a/ui/static/templates/groupmanage.html b/ui/static/templates/groupmanage.html
@@ -32,7 +32,7 @@
 			</table>
 		</div>
 	</tab>
-	<tab heading="Description &amp; Settings" ui-sref="root.group.edit()" class="settings" >
+	<tab heading="Description &amp; Settings" class="settings">
 		<form action="">
 			<div class="form-group">
 				<h4>What's this group about</h4>