Change: prevent user from drag/drop readonly issues

Fixes #109
satrun77 · Jul 10, 2016 · 507318d · 507318d
1 parent 6ac5ea6
commit 507318d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/app/Model/Tag.php b/app/Model/Tag.php
@@ -127,11 +127,17 @@ public function canView()
     /**
      * Whether or not the tag to mark issue as ready only.
      *
+     * @param User $user
+     *
      * @return bool
      */
-    public function isReadOnly()
+    public function isReadOnly(User $user = null)
     {
-        return (boolean) $this->readonly;
+        if (is_null($user)) {
+            return (boolean) $this->readonly;
+        }
+
+        return (boolean) $this->readonly && $user->role_id <= $this->readonly;
     }
 
     /**

diff --git a/resources/assets/images/icons/lock.png b/resources/assets/images/icons/lock.png
diff --git a/resources/assets/less/app/kanban.less b/resources/assets/less/app/kanban.less
@@ -296,6 +296,18 @@
           padding-right: 2px;
         }
       }
+
+      .readonly {
+        .issue {
+          background: #fff url(../../images/icons/lock.png) no-repeat left 83%;
+          background-size: 20px;
+          border-right: 1px solid;
+          border-top: 1px solid;
+          border-bottom: 1px solid;
+          box-shadow: none;
+          cursor: default;
+        }
+      }
     }
   }
 

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -507,7 +507,7 @@ function Kanban() {
             }
 
             var win = $(window);
-            container = kanban.find(".column .content");
+            container = kanban.find(".column .content:not(.readonly)");
             task = kanban.find('.issue');
             setKanbantWidth = function () {
                 var bodyWidth = win.width();

diff --git a/resources/views/user/issues-kanban.blade.php b/resources/views/user/issues-kanban.blade.php
@@ -55,7 +55,7 @@
                         <div class="arrowcaption" style="color:{{ $column->bgcolor or 'gray' }};">{{ $column->name }}</div>
                         <div class="arrow"></div>
 
-                        <div class="content" data-column="{{ $column->id }}">
+                        <div class="content @if($column->isReadOnly(auth()->user()))readonly @endif" data-column="{{ $column->id }}">
                             @if ($issues->get($column->name))
                                 @foreach($issues->get($column->name) as $issue)
                                     <div class="issue issue-{{ $issue->id }}"