Collaborators became removable.

src/main/scala/app/SettingsController.scala

@@ -66,13 +66,25 @@ trait SettingsControllerBase extends ControllerBase { self: RepositoryService wi
   /**
    * Add the collaborator.
    */
-  post("/:owner/:repository/settings/collaborators/_add", collaboratorForm)(ownerOnly { form =>
+  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { form =>
     val owner      = params("owner")
     val repository = params("repository")
     addCollaborator(owner, repository, form.userName)
     redirect("/%s/%s/settings/collaborators".format(owner, repository))
   })
 
+  /**
+   * Add the collaborator.
+   */
+  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly {
+    val owner      = params("owner")
+    val repository = params("repository")
+    val userName   = params("name")
+    removeCollaborator(owner, repository, userName)
+    redirect("/%s/%s/settings/collaborators".format(owner, repository))
+  })
+  
+  
   /**
    * Provides Constraint to validate the collaborator name.
    */

src/main/scala/service/RepositoryService.scala

@@ -26,7 +26,7 @@ trait RepositoryService { self: AccountService =>
 
     val currentDate = new java.sql.Date(System.currentTimeMillis)
 
-    Repositories.* insert
+    Repositories insert
       Repository(
         repositoryName   = repositoryName,
         userName         = userName,
@@ -130,11 +130,31 @@ trait RepositoryService { self: AccountService =>
    * @param collaboratorName the collaborator name
    */
   def addCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
-    Collaborators.* insert(Collaborator(userName, repositoryName, collaboratorName))
+    Collaborators insert(Collaborator(userName, repositoryName, collaboratorName))
 
+  /**
+   * Remove collaborator from the repository.
+   * 
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
+   * @param collaboratorName the collaborator name
+   */
+  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
+    (Query(Collaborators) filter { c =>
+        (c.userName is userName.bind) && (c.repositoryName is repositoryName.bind) && (c.collaboratorName is collaboratorName.bind)
+    }).delete
+  
+    
+  /**
+   * Returns the list of collaborators name which is sorted with ascending order.
+   * 
+   * @param userName the user name of the repository owner
+   * @param repositoryName the repository name
+   * @return the list of collaborators name
+   */
   def getCollaborators(userName: String, repositoryName: String): List[String] =
-    (Query(Collaborators) filter { collaborator =>
+    (Query(Collaborators) filter { c =>
-      (collaborator.userName is userName.bind) && (collaborator.repositoryName is repositoryName.bind)
+      (c.userName is userName.bind) && (c.repositoryName is repositoryName.bind)
     } sortBy(_.collaboratorName) list) map(_.collaboratorName)
 
 }

src/main/twirl/settings/collaborators.scala.html

@@ -4,12 +4,15 @@
   @html.header("settings", repository)
   @menu("collaborators", repository){
     <h3>Manage Collaborators</h3>
-    <ul>
+    <ul class="collaborator">
       @collaborators.map { collaboratorName =>
-        <li>@collaboratorName</li>
+        <li>
+          <a href="@path/@collaboratorName">@collaboratorName</a>
+          <a href="@path/@repository.owner/@repository.name/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
+        </li>
       }
     </ul>
-    <form method="POST" action="@path/@repository.owner/@repository.name/settings/collaborators/_add" validate="true">
+    <form method="POST" action="@path/@repository.owner/@repository.name/settings/collaborators/add" validate="true">
       <div>
         <span class="error" id="error-userName"></span>
       </div>

src/main/webapp/assets/common/css/gitbucket.css

@@ -152,4 +152,25 @@ dd {
 hr {
   margin-top: 4px;
   margin-bottom: 4px;
+}
+
+ul.collaborator {
+  list-style-type: none;
+  margin-left: 0px;
+}
+    
+ul.collaborator li {
+  background-color: #eee;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  padding: 6px;
+}
+    
+ul.collaborator li:hover {
+  background-color: #f8f8f8;
+}
+
+ul.collaborator a.remove {
+  color: #dd0000;
+  text-decoration: underline;
 }