From 0124f7cc3c8ec7669f80d6aae290eb4d5b5c25d1 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 28 Sep 2014 11:35:19 +0900
Subject: [PATCH] (refs #488)Change permission to access to labels

---
 src/main/scala/app/LabelsController.scala    | 15 ++++++++++-----
 src/main/twirl/issues/labels/list.scala.html | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/app/LabelsController.scala b/src/main/scala/app/LabelsController.scala
index 3fe8c0427..af01bdcc1 100644
--- a/src/main/scala/app/LabelsController.scala
+++ b/src/main/scala/app/LabelsController.scala
@@ -2,15 +2,17 @@ package app
 
 import jp.sf.amateras.scalatra.forms._
 import service._
-import util.CollaboratorsAuthenticator
+import util.{ReferrerAuthenticator, CollaboratorsAuthenticator}
 import util.Implicits._
 import org.scalatra.i18n.Messages
 
 class LabelsController extends LabelsControllerBase
-  with LabelsService with RepositoryService with AccountService with CollaboratorsAuthenticator
+  with LabelsService with RepositoryService with AccountService
+with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait LabelsControllerBase extends ControllerBase {
-  self: LabelsService with RepositoryService with CollaboratorsAuthenticator =>
+  self: LabelsService with RepositoryService
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   case class LabelForm(labelName: String, color: String)
 
@@ -24,8 +26,11 @@ trait LabelsControllerBase extends ControllerBase {
     "editColor"     -> trim(label("Color",      text(required, color)))
   )(LabelForm.apply)
 
-  get("/:owner/:repository/issues/labels")(collaboratorsOnly { repository =>
-    issues.labels.html.list(getLabels(repository.owner, repository.name), repository, true) // TODO hasWritePermission
+  get("/:owner/:repository/issues/labels")(referrersOnly { repository =>
+    issues.labels.html.list(
+      getLabels(repository.owner, repository.name),
+      repository,
+      hasWritePermission(repository.owner, repository.name, context.loginAccount))
   })
 
   ajaxGet("/:owner/:repository/issues/labels/new")(collaboratorsOnly { repository =>
diff --git a/src/main/twirl/issues/labels/list.scala.html b/src/main/twirl/issues/labels/list.scala.html
index a83464c39..f5b5b87ec 100644
--- a/src/main/twirl/issues/labels/list.scala.html
+++ b/src/main/twirl/issues/labels/list.scala.html
@@ -22,21 +22,24 @@
               <div class="span8">
                 <div style="margin-top: 6px">
                   <a href="@url(repository)/issues?labels=@urlEncode(label.labelName)">
-                    <span class="label-color" style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%;">@label.labelName</span>
+                    <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">@label.labelName</span>
                   </a>
                 </div>
               </div>
-              <div class="span2">
-                <span class="muted">x open issues</span>
+              <div class="@if(hasWritePermission){span2} else {span4}">
+                <div class="pull-right">
+                  <span class="muted">x open issues</span>
+                </div>
               </div>
-              <div class="span2">
-                @if(hasWritePermission){
+              @if(hasWritePermission){
+                <div class="span2">
                   <div class="pull-right">
                     <a href="javascript:void(0);" class="label-edit-link" data-label-id="@label.labelId">Edit</a>
+                    &nbsp;&nbsp;
                     <a href="@url(repository)/issues/labels/@label.labelId/delete" class="delete">Delete</a>
                   </div>
-                }
-              </div>
+                </div>
+              }
             </div>
           </td>
         </tr>