2 files changed, 6 insertions, 0 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 82f74c9e..c53e7f66 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -55,6 +55,7 @@ class Organize_Controller extends Controller {
     $data = array(
       "sort_column" => $album->sort_column,
       "sort_order" => $album->sort_order,
+      "editable" => access::can("edit", $album),
       "children" => array());
 
     foreach ($album->viewable()->children() as $child) {
diff --git a/modules/organize/views/organize_frame.html.php b/modules/organize/views/organize_frame.html.php
index cfc3933c..5516d7d8 100644
--- a/modules/organize/views/organize_frame.html.php
+++ b/modules/organize/views/organize_frame.html.php
@@ -53,6 +53,11 @@
           thumb_data_view.bindStore(store);
           sort_column_combobox.setValue(album_info.sort_column);
           sort_order_combobox.setValue(album_info.sort_order);
+          if (album_info.editable) {
+            thumb_data_view.dragZone.unlock();
+          } else {
+            thumb_data_view.dragZone.lock();
+          }
         },
         failure: show_generic_error
       });