(refs #241)Add validation for create / edit group form.

2025-11-02 11:36:05 +01:00 · 2014-03-04 10:23:44 +09:00
parent e3fd564efd
commit 21f7888f55
3 changed files with 72 additions and 51 deletions
--- a/src/main/scala/app/CreateController.scala
+++ b/src/main/scala/app/CreateController.scala
@@ -41,25 +41,25 @@ trait CreateControllerBase extends AccountManagementControllerBase {
  )(ForkRepositoryForm.apply)

  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                          memberNames: Option[String])
+                          members: String)

  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                           memberNames: Option[String], clearImage: Boolean, isRemoved: Boolean)
+                           members: 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())))
+    "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()))),
+    "members"   -> trim(label("Members"    ,text(required, members)))
  )(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()))
+    "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()))),
+    "members"    -> trim(label("Members"     ,text(required, members))),
+    "clearImage" -> trim(label("Clear image" ,boolean())),
+    "removed"    -> trim(label("Disable"     ,boolean()))
  )(EditGroupForm.apply)

  /**
@@ -197,16 +197,16 @@ trait CreateControllerBase extends AccountManagementControllerBase {
  })

  get("/groups/new")(usersOnly {
-    html.group(None, Nil)
+    html.group(None, List((context.loginAccount.get.userName, true)))
  })

  post("/groups/new", newGroupForm)(usersOnly { form =>
    createGroup(form.groupName, form.url)
-    updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").map {
+    updateGroupMembers(form.groupName, form.members.split(",").map {
      _.split(":") match {
        case Array(userName, isManager) => (userName, isManager.toBoolean)
      }
-    }.toList).getOrElse(Nil))
+    }.toList)
    updateImage(form.groupName, form.fileId, false)
    redirect(s"/${form.groupName}")
  })
@@ -218,11 +218,11 @@ trait CreateControllerBase extends AccountManagementControllerBase {
  })

  post("/:groupName/_edit", editGroupForm)(managersOnly { form =>
-    defining(params("groupName"), form.memberNames.map(_.split(",").map {
+    defining(params("groupName"), form.members.split(",").map {
      _.split(":") match {
        case Array(userName, isManager) => (userName, isManager.toBoolean)
      }
-    }.toList).getOrElse(Nil)){ case (groupName, members) =>
+    }.toList){ case (groupName, members) =>
      getAccountByUserName(groupName, true).map { account =>
        updateGroup(groupName, form.url, form.isRemoved)

@@ -276,4 +276,13 @@ trait CreateControllerBase extends AccountManagementControllerBase {
      }
  }

+  private def members: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      if(value.split(",").exists {
+        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+      }) None else Some("Must select one manager at least.")
+    }
+  }
+
+
 }
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -34,9 +34,10 @@
        <div class="span5">
          <fieldset>
            <label class="strong">Members</label>
-            <ul id="members" class="collaborator">
+            <ul id="member-list" class="collaborator">
              @members.map { case (userName, isManager) =>
                <li data-name="@userName">
+                  <input type="checkbox" class="is_manager" id="is_manager_@userName" @if(isManager){checked}/>
                  <a href="@path/@url(userName)">@userName</a>
                  <a href="#" class="remove">(remove)</a>
                </li>
@@ -44,9 +45,9 @@
            </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(",")"/>
+            <input type="hidden" id="members" name="members" value="@members.map(x => x._1 + ":" + x._2).mkString(",")"/>
            <div>
-              <span class="error" id="error-memberName"></span>
+              <span class="error" id="error-members"></span>
            </div>
          </fieldset>
        </div>
@@ -70,7 +71,7 @@ $(function(){
    }

    // check duplication
-    var exists = $('#members li').filter(function(){
+    var exists = $('#member-list li').filter(function(){
      return $(this).data('name') == userName;
    }).length > 0;
    if(exists){
@@ -84,18 +85,16 @@ $(function(){
    }, function(data, status){
      if(data == 'true'){
        // add member
-        $('#members').append($('<li>')
+        $('#member-list').append($('<li>')
          .data('name', userName)
+          .append($('<input type="checkbox" class="is_manager">').attr('id', 'is_manager_' + userName))
          .append($('<a>').attr('href', '@path/' + userName).text(userName))
          .append(' ')
          .append($('<a>').attr('href', '#').addClass('remove').text('(remove)')));
-        $('#memberName').val('');
+        $('#members').val('');

        // update hidden value
-        var userNames = $('#members li').map(function(i, e){
-          return $(e).data('name');
-        }).get().join(',');
-        $('#memberNames').val(userNames);
+        updateMembers();
      } else {
        $('#error-memberName').text('User does not exist.');
      }
@@ -105,12 +104,9 @@ $(function(){
  $(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);
+    updateMembers();
+    $('#members').val(members);
  });

  // Don't submit form by ENTER key
@@ -118,5 +114,17 @@ $(function(){
    console.log(e.keyCode);
    return !(e.keyCode == 13);
  });
+
+  $('.is_manager').change(function(){
+    updateMembers();
+  });
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('#is_manager_' + userName).prop('checked');
+    }).get().join(',');
+    $('#members').val(members);
+  }
 });
 </script>
--- a/src/main/twirl/group.scala.html
+++ b/src/main/twirl/group.scala.html
@@ -34,10 +34,10 @@
        <div class="span5">
          <fieldset>
            <label class="strong">Members</label>
-            <ul id="members" class="collaborator">
+            <ul id="member-list" class="collaborator">
              @members.map { case (userName, isManager) =>
                <li data-name="@userName">
-                  <input type="checkbox" id="is_manager_@userName" @if(isManager){checked}/>
+                  <input type="checkbox" class="is_manager" id="is_manager_@userName" @if(isManager){checked}/>
                  <a href="@path/@url(userName)">@userName</a>
                  <a href="#" class="remove">(remove)</a>
                </li>
@@ -45,9 +45,9 @@
            </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(",")"/>
+            <input type="hidden" id="members" name="members" value="@members.map(x => x._1 + ":" + x._2).mkString(",")"/>
            <div>
-              <span class="error" id="error-memberName"></span>
+              <span class="error" id="error-members"></span>
            </div>
          </fieldset>
        </div>
@@ -70,7 +70,7 @@ $(function(){
    }

    // check duplication
-    var exists = $('#members li').filter(function(){
+    var exists = $('#member-list li').filter(function(){
      return $(this).data('name') == userName;
    }).length > 0;
    if(exists){
@@ -84,20 +84,16 @@ $(function(){
    }, function(data, status){
      if(data == 'true'){
        // add member
-        $('#members').append($('<li>')
+        $('#member-list').append($('<li>')
          .data('name', userName)
-          .append($('<input type="checkbox">').attr('id', 'is_manager_' + userName))
+          .append($('<input type="checkbox" class="is_manager">').attr('id', 'is_manager_' + userName))
          .append($('<a>').attr('href', '@path/' + userName).text(userName))
          .append(' ')
          .append($('<a>').attr('href', '#').addClass('remove').text('(remove)')));
-        $('#memberName').val('');
+        $('#members').val('');

        // update hidden value
-        var userNames = $('#members li').map(function(i, e){
-          var userName = $(e).data('name');
-          return userName + ':' + $('#is_manager_' + userName).prop('checked');
-        }).get().join(',');
-        $('#memberNames').val(userNames);
+        updateMembers();
      } else {
        $('#error-memberName').text('User does not exist.');
      }
@@ -107,13 +103,9 @@ $(function(){
  $(document).on('click', '.remove', function(){
    // remove member
    $(this).parent().remove();
-
    // update hidden value
-    var userNames = $('#members li').map(function(i, e){
-      var userName = $(e).data('name');
-      return userName + ':' + $('#is_manager_' + userName).prop('checked');
-    }).get().join(',');
-    $('#memberNames').val(userNames);
+    updateMembers();
+    $('#members').val(members);
  });

  // Don't submit form by ENTER key
@@ -121,5 +113,17 @@ $(function(){
    console.log(e.keyCode);
    return !(e.keyCode == 13);
  });
+
+  $('.is_manager').change(function(){
+    updateMembers();
+  });
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('#is_manager_' + userName).prop('checked');
+    }).get().join(',');
+    $('#members').val(members);
+  }
 });
 </script>