(refs #198)Allow create group by normal users.

src/main/scala/app/CreateRepositoryController.scala

@@ -9,35 +9,59 @@ import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.lib.{FileMode, Constants}
 import org.eclipse.jgit.dircache.DirCache
 import org.scalatra.i18n.Messages
+import org.apache.commons.io.FileUtils
 
 class CreateRepositoryController extends CreateRepositoryControllerBase
   with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
   with UsersAuthenticator with ReadableUsersAuthenticator
 
 /**
- * Creates new repository.
+ * Creates new repository or group.
  */
-trait CreateRepositoryControllerBase extends ControllerBase {
+trait CreateRepositoryControllerBase extends AccountManagementControllerBase {
   self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService
     with UsersAuthenticator with ReadableUsersAuthenticator =>
 
-  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 newForm = mapping(
+  val newRepositoryForm = mapping(
     "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
-    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
+    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))),
     "description"  -> trim(label("Description"    , optional(text()))),
     "isPrivate"    -> trim(label("Repository Type", boolean())),
     "createReadme" -> trim(label("Create README"  , boolean()))
   )(RepositoryCreationForm.apply)
 
-  val forkForm = mapping(
+  val forkRepositoryForm = mapping(
     "owner" -> trim(label("Repository owner", text(required))),
     "name"  -> trim(label("Repository name",  text(required)))
   )(ForkRepositoryForm.apply)
 
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
+                          memberNames: Option[String])
+
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
+                           memberNames: Option[String], clearImage: Boolean, isRemoved: Boolean)
+
+  val newGroupForm = mapping(
+    "groupName"   -> trim(label("Group name"   ,text(required, maxlength(100), identifier, uniqueUserName))),
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "memberNames" -> trim(label("Member Names" ,optional(text())))
+  )(NewGroupForm.apply)
+
+  val editGroupForm = mapping(
+    "groupName"   -> trim(label("Group name"   ,text(required, maxlength(100), identifier))),
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "memberNames" -> trim(label("Member Names" ,optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "removed"     -> trim(label("Disable"      ,boolean()))
+  )(EditGroupForm.apply)
+
   /**
    * Show the new repository form.
    */
@@ -48,7 +72,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
   /**
    * Create new repository.
    */
-  post("/new", newForm)(usersOnly { form =>
+  post("/new", newRepositoryForm)(usersOnly { form =>
     LockUtil.lock(s"${form.owner}/${form.name}/create"){
       if(getRepository(form.owner, form.name, baseUrl).isEmpty){
         val ownerAccount  = getAccountByUserName(form.owner).get
@@ -172,6 +196,57 @@ trait CreateRepositoryControllerBase extends ControllerBase {
     }
   })
 
+  get("/groups/new")(usersOnly {
+    html.group(None, Nil)
+  })
+
+  post("/groups/new", newGroupForm)(usersOnly { form =>
+    createGroup(form.groupName, form.url)
+    updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil))
+    updateImage(form.groupName, form.fileId, false)
+    redirect(s"/${form.groupName}")
+  })
+
+  get("/:groupName/_edit")(usersOnly { // TODO group manager only
+    defining(params("groupName")){ groupName =>
+      html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    }
+  })
+
+  post("/:groupName/_edit", editGroupForm)(usersOnly { form => // TODO group manager only
+    defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) =>
+      getAccountByUserName(groupName, true).map { account =>
+        updateGroup(groupName, form.url, form.isRemoved)
+
+        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, memberNames)
+          // Update COLLABORATOR for group repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            removeCollaborators(form.groupName, repositoryName)
+            memberNames.foreach { userName =>
+              addCollaborator(form.groupName, repositoryName, userName)
+            }
+          }
+        }
+
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect(s"/${form.groupName}")
+
+      } getOrElse NotFound
+    }
+  })
+
   private def insertDefaultLabels(userName: String, repositoryName: String): Unit = {
     createLabel(userName, repositoryName, "bug", "fc2929")
     createLabel(userName, repositoryName, "duplicate", "cccccc")
@@ -186,10 +261,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
       if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
   }
 
-  /**
-   * Duplicate check for the repository name.
-   */
-  private def unique: Constraint = new Constraint(){
+  private def uniqueRepository: Constraint = new Constraint(){
     override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
       params.get("owner").flatMap { userName =>
         getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")

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

@@ -41,6 +41,13 @@
               </div>
             </li>
           }
+          @if(loginAccount.isDefined && account.isGroupAccount){
+            <li class="pull-right">
+              <div class="button-group">
+                <a href="@url(account.userName)/_edit" class="btn">Edit Group</a>
+              </div>
+            </li>
+          }
         </ul>
         @body
       </div>

src/main/twirl/group.scala.html

@@ -0,0 +1,121 @@
+@(account: Option[model.Account], members: List[String])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@main("Create a group"){
+<div style="width: 700px; margin: 10px auto;">
+  <form id="form" method="post" action="@path/groups/new" validate="true">
+      <div class="row-fluid">
+        <div class="span7">
+          <fieldset>
+            <label for="groupName" class="strong">Group name</label>
+            <div>
+              <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>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
+            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+          </fieldset>
+          <fieldset>
+            <label for="avatar" class="strong">Image (Optional)</label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+        <div class="span5">
+          <fieldset>
+            <label class="strong">Members</label>
+            <ul id="members" class="collaborator">
+              @members.map { userName =>
+                <li data-name="@userName">
+                  <a href="@path/@url(userName)">@userName</a>
+                  <a href="#" class="remove">(remove)</a>
+                </li>
+              }
+            </ul>
+            @helper.html.account("memberName", 200)
+            <input type="button" class="btn" value="Add" id="addMember"/>
+            <input type="hidden" id="memberNames" name="memberNames" value="@members.mkString(",")"/>
+            <div>
+              <span class="error" id="error-memberName"></span>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+      </fieldset>
+  </form>
+</div>
+}
+<script>
+$(function(){
+  $('#addMember').click(function(){
+    $('#error-memberName').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#members li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-memberName').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@path/admin/users/_usercheck', {
+      'userName': userName
+    }, function(data, status){
+      if(data == 'true'){
+        // add member
+        $('#members').append($('<li>')
+          .data('name', userName)
+          .append($('<a>').attr('href', '@path/' + userName).text(userName))
+          .append(' ')
+          .append($('<a>').attr('href', '#').addClass('remove').text('(remove)')));
+        $('#memberName').val('');
+
+        // update hidden value
+        var userNames = $('#members li').map(function(i, e){
+          return $(e).data('name');
+        }).get().join(',');
+        $('#memberNames').val(userNames);
+      } else {
+        $('#error-memberName').text('User does not exist.');
+      }
+    });
+  });
+
+  $(document).on('click', '.remove', function(){
+    // remove member
+    $(this).parent().remove();
+
+    // update hidden value
+    var userNames = $('#members li').map(function(i, e){
+      return $(e).data('name');
+    }).get().join(',');
+    $('#memberNames').val(userNames);
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    console.log(e.keyCode);
+    return !(e.keyCode == 13);
+  });
+});
+</script>

src/main/twirl/main.scala.html

@@ -54,7 +54,11 @@
               }
               @if(loginAccount.isDefined){
                 <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
-                <a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>
+                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="icon-plus"></i></a>
+                <ul class="dropdown-menu">
+                  <li><a href="@path/new">New repository</a></li>
+                  <li><a href="@path/groups/new">New group</a></li>
+                </ul>
                 <a href="@url(loginAccount.get.userName)/_edit" class="menu" data-toggle="tooltip" data-placement="bottom" title="Account settings"><i class="icon-user"></i></a>
                 @if(loginAccount.get.isAdmin){
                   <a href="@path/admin/users" class="menu" data-toggle="tooltip" data-placement="bottom" title="Administration"><i class="icon-wrench"></i></a>