(refs #241)Group management improvement is completed in user side

src/main/scala/app/CreateController.scala

@@ -22,9 +22,7 @@ trait CreateControllerBase extends AccountManagementControllerBase {
   self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService
     with UsersAuthenticator with ReadableUsersAuthenticator with GroupManagerAuthenticator =>
 
-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String],
-                                    isPrivate: Boolean, createReadme: Boolean)
-
+  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
   case class ForkRepositoryForm(owner: String, name: String)
 
   val newRepositoryForm = mapping(
@@ -40,11 +38,8 @@ trait CreateControllerBase extends AccountManagementControllerBase {
     "name"  -> trim(label("Repository name",  text(required)))
   )(ForkRepositoryForm.apply)
 
-  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                          members: String)
-
-  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                           members: String, clearImage: Boolean, isRemoved: Boolean)
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
 
   val newGroupForm = mapping(
     "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
@@ -58,8 +53,7 @@ trait CreateControllerBase extends AccountManagementControllerBase {
     "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
     "fileId"     -> trim(label("File ID"     ,optional(text()))),
     "members"    -> trim(label("Members"     ,text(required, members))),
-    "clearImage" -> trim(label("Clear image" ,boolean())),
-    "removed"    -> trim(label("Disable"     ,boolean()))
+    "clearImage" -> trim(label("Clear image" ,boolean()))
   )(EditGroupForm.apply)
 
   /**
@@ -211,32 +205,36 @@ trait CreateControllerBase extends AccountManagementControllerBase {
     redirect(s"/${form.groupName}")
   })
 
-  get("/:groupName/_edit")(managersOnly {
+  get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
       html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
     }
   })
 
-  post("/:groupName/_edit", editGroupForm)(managersOnly { form =>
+  get("/:groupName/_deletegroup")(managersOnly {
+    defining(params("groupName")){ groupName =>
+      // Remove from GROUP_MEMBER
+      updateGroupMembers(groupName, Nil)
+      // Remove repositories
+      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+        deleteRepository(groupName, repositoryName)
+        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+      }
+    }
+    redirect("/")
+  })
+
+  post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
     defining(params("groupName"), form.members.split(",").map {
       _.split(":") match {
         case Array(userName, isManager) => (userName, isManager.toBoolean)
       }
     }.toList){ case (groupName, members) =>
       getAccountByUserName(groupName, true).map { account =>
-        updateGroup(groupName, form.url, form.isRemoved)
+        updateGroup(groupName, form.url, false)
 
-        if(form.isRemoved){
-          // Remove from GROUP_MEMBER
-          updateGroupMembers(form.groupName, Nil)
-          // Remove repositories
-          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-            deleteRepository(groupName, repositoryName)
-            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
-            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
-          }
-        } else {
         // Update GROUP_MEMBER
         updateGroupMembers(form.groupName, members)
         // Update COLLABORATOR for group repositories
@@ -246,7 +244,6 @@ trait CreateControllerBase extends AccountManagementControllerBase {
             addCollaborator(form.groupName, repositoryName, userName)
           }
         }
-        }
 
         updateImage(form.groupName, form.fileId, form.clearImage)
         redirect(s"/${form.groupName}")

src/main/twirl/account/main.scala.html

@@ -45,7 +45,7 @@
           @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
             <li class="pull-right">
               <div class="button-group">
-                <a href="@url(account.userName)/_edit" class="btn">Edit Group</a>
+                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
               </div>
             </li>
           }

src/main/twirl/group.scala.html

@@ -1,9 +1,9 @@
 @(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@main("Create a group"){
+@main(if(account.isEmpty) "Create group" else "Edit group"){
 <div style="width: 700px; margin: 10px auto;">
-  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_edit}" validate="true">
+  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
       <div class="row-fluid">
         <div class="span7">
           <fieldset>
@@ -12,12 +12,14 @@
               <span id="error-groupName" class="error"></span>
             </div>
             <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            @*
             @if(account.isDefined){
               <label for="removed">
                 <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
                 Disable
               </label>
             }
+            *@
           </fieldset>
           <fieldset>
             <label class="strong">URL (Optional)</label>
@@ -53,7 +55,15 @@
         </div>
       </div>
       <fieldset class="margin">
+        @if(account.isDefined){
+          <div class="pull-right">
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+          </div>
+        }
         <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        @if(account.isDefined){
+          <a href="@url(account.get.userName)" class="btn">Cancel</a>
+        }
       </fieldset>
   </form>
 </div>
@@ -118,6 +128,10 @@ $(function(){
     updateMembers();
   });
 
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
   function updateMembers(){
     var members = $('#member-list li').map(function(i, e){
       var userName = $(e).data('name');