Change: show warning readonly message instead of 401

Issue #39
satrun77 · Jul 10, 2016 · 2be7f81 · 2be7f81
1 parent b167301
commit 2be7f81
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 17 deletions.
diff --git a/app/Form/Issue.php b/app/Form/Issue.php
@@ -34,6 +34,13 @@ class Issue extends FormAbstract
      */
     protected $tags = null;
 
+    /**
+     * Is issue readonly.
+     *
+     * @var bool
+     */
+    protected $readOnly = false;
+
     /**
      * @param string $type
      *
@@ -83,6 +90,7 @@ public function setup(array $params)
         $this->project = $params['project'];
         if (!empty($params['issue'])) {
             $this->editingModel($params['issue']);
+            $this->readOnly = $this->getModel()->hasReadOnlyTag(auth()->user());
         }
     }
 
@@ -91,18 +99,23 @@ public function setup(array $params)
      */
     public function actions()
     {
-        $actions = [
-            'submit' => $this->isEditing() ? 'update_issue' : 'create_issue',
-        ];
+        $actions = [];
 
-        if ($this->isEditing() && auth()->user(Model\Permission::PERM_ISSUE_MODIFY)) {
-            $actions['delete'] = [
-                'type'         => 'danger_submit',
-                'label'        => trans('tinyissue.delete_something', ['name' => '#' . $this->getModel()->id]),
-                'class'        => 'close-issue',
-                'name'         => 'delete-issue',
-                'data-message' => trans('tinyissue.delete_issue_confirm'),
+        // Check if issue is in readonly tag
+        if (!$this->readOnly) {
+            $actions = [
+                'submit' => $this->isEditing() ? 'update_issue' : 'create_issue',
             ];
+
+            if ($this->isEditing() && auth()->user(Model\Permission::PERM_ISSUE_MODIFY)) {
+                $actions['delete'] = [
+                    'type'         => 'danger_submit',
+                    'label'        => trans('tinyissue.delete_something', ['name' => '#' . $this->getModel()->id]),
+                    'class'        => 'close-issue',
+                    'name'         => 'delete-issue',
+                    'data-message' => trans('tinyissue.delete_issue_confirm'),
+                ];
+            }
         }
 
         return $actions;
@@ -115,7 +128,9 @@ public function fields()
     {
         $issueModify = \Auth::user()->permission('issue-modify');
 
-        $fields = $this->fieldTitle();
+        $fields = [];
+        $fields += $this->readOnlyMessage();
+        $fields += $this->fieldTitle();
         $fields += $this->fieldBody();
         $fields += $this->fieldTypeTags();
 
@@ -160,6 +175,22 @@ protected function issueModifyFields()
         return $fields;
     }
 
+    /**
+     * Returns message about read only issue.
+     *
+     * @return array
+     */
+    protected function readOnlyMessage()
+    {
+        return [
+            'readonly' => [
+                'type'  => 'plaintext',
+                'label' => ' ',
+                'value' => '<div class="alert alert-warning">' . trans('tinyissue.readonly_issue_message') . '</div>',
+            ],
+        ];
+    }
+
     /**
      * Returns title field.
      *

diff --git a/app/Model/User.php b/app/Model/User.php
@@ -178,12 +178,6 @@ public function permissionInContext(Route $route)
             return false;
         }
 
-        // Check if issue is in readonly tag
-        $permission = array_get($route->getAction(), 'permission');
-        if ($issue instanceof Issue && $permission === Permission::PERM_ISSUE_MODIFY) {
-            return !$issue->hasReadOnlyTag($this);
-        }
-
         return true;
     }
 

diff --git a/resources/lang/en/tinyissue.php b/resources/lang/en/tinyissue.php
@@ -231,4 +231,5 @@
     'attachment_has_been_deleted'        => 'The attachment has been deleted.',
     'your_created_issues_description'    => 'Issues that are created by you',
     'issue_created_by_you'               => 'Issue Created By You',
+    'readonly_issue_message'             => 'The issue is in read only status.',
 ];