Changeset 726e265f078bf31aa4c2386546da1a2a27a05848

Timestamp:

09/25/11 14:06:57 (8 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

6962dbe2230051bb593a4854f784df11ad37c6ca

Parents:

e0d7c0e704e5bf97231c4c96a5d4f455b4c5e8ac

git-committer:

Xemle <xemle@phtagr.org> / 2011-09-25T14:06:57Z+0200

Message:

Edit single access right in explorer

Files:

• controllers/components/search.php (modified) (1 diff)
• controllers/explorer_controller.php (modified) (5 diffs)
• views/elements/explorer/description.ctp (modified) (1 diff)
• views/elements/explorer/media.ctp (modified) (1 diff)
• views/explorer/editacl.ctp (modified) (2 diffs)
• views/explorer/index.ctp (modified) (2 diffs)
• webroot/css/default/_form.sass (modified) (1 diff)

controllers/components/search.php

@@ -345 +345 @@
   }
 
+  /** 
+    Sets the data for the search helper 
+    */
+  function setHelperData() {
+    $params = array(
+      'pageCount' => 0, 
+      'current' => 0, 
+      'nextPage' => false, 
+      'prevPage' => false,
+      'baseUri' => $this->baseUri,
+      'afterUri' => false,
+      'defaults' => $this->defaults,
+      'data' => $this->getParams()
+      );
+    $this->controller->params['search'] = $params;
+  }
+
   function paginateMediaByCrumb($id, $crumbs) {
     $tmp = $this->getParams();

controllers/explorer_controller.php

@@ -768 +768 @@
    */
   function updatemeta($id) {
-    if (!$this->RequestHandler->isAjax() || !$this->RequestHandler->isPost()) {
+    if (!$this->RequestHandler->isAjax()) {
       Logger::warn("Decline wrong ajax request");
       $this->redirect(null, '404');
@@ -781 +781 @@
 
   function editacl($id) {
-    if (!$this->RequestHandler->isAjax() || !$this->RequestHandler->isPost()) {
+    if (!$this->RequestHandler->isAjax()) {
       Logger::warn("Decline wrong ajax request");
       $this->redirect(null, '404');
@@ -805 +805 @@
 
   function saveacl($id) {
-    if (!$this->RequestHandler->isAjax() || !$this->RequestHandler->isPost()) {
+    if (!$this->RequestHandler->isAjax()) {
       Logger::warn("Decline wrong ajax request");
       $this->redirect(null, '404');
@@ -817 +817 @@
       $user = $this->getUser();
       $userId = $user['User']['id'];
+      $this->Search->setUser($user['User']['username']); // Triggers acl descriptions
       if (!$this->Media->checkAccess(&$media, &$user, 1, 0)) {
         Logger::warn("User '{$user['User']['username']}' ({$user['User']['id']}) has no previleges to change ACL of image ".$id);
@@ -840 +841 @@
         $media['Media']['modified'] = null;
         $this->Media->save($media['Media'], true, array('group_id', 'gacl', 'uacl', 'oacl'));
+        Logger::info("Changed acl of media $id");
       }
     }
     $media = $this->Media->findById($id);
     $this->Media->setAccessFlags(&$media, $this->getUser());
-    $this->set('data', $media);
+    $this->data = $media;
     $this->layout='bare';
+    $this->Search->setUser($user['User']['username']);
+    $this->Search->setHelperData();
+    Configure::write('debug', 0);
     $this->render('updatemeta');
-    Configure::write('debug', 0);
   }
 

views/elements/explorer/description.ctp

@@ +1 @@
+<?php $search->initialize(); ?>
 <?php echo $this->element('explorer/date', array('media' => $media)); ?>
 <?php if (count($media['Tag'])): ?>

views/elements/explorer/media.ctp

@@ -44 +44 @@
       array('escape' => false));
   }
+  if ($search->getUser() == $currentUser['User']['username'] && $media['Media']['canWriteAcl']) {
+    $keyIcon = $this->Html->image('icons/key.png', array('title' => __('Edit access rights', true), 'alt' => 'Edit ACL'));
+    echo $html->tag('li', 
+      $html->link($keyIcon, 'javascript:void', array('escape' => false, 'class' => 'acl')),
+      array('escape' => false));
+  }
   if ($media['Media']['canReadOriginal']) {
     foreach ($media['File'] as $file) {

views/explorer/editacl.ctp

@@ -1 +1 @@
 <?php 
   $mediaId = $data['Media']['id'];
-  echo $ajax->form('saveacl/'.$mediaId, 'post', array('url' => '/explorer/saveacl/'.$mediaId, 'update' => 'meta-'.$mediaId)); 
+  echo $form->create(null, array('url' => 'saveacl/'.$mediaId, 'id' => 'form-acl-'.$mediaId));
 ?>
 <fieldset>
@@ -12 +12 @@
 ?>
 </fieldset>
-<?php
-  echo $form->submit(__('Save', true), array('div' => false)); 
-  echo $ajax->link(__('Cancel', true), '/explorer/updatemeta/'.$mediaId, array('update' => 'meta-'.$mediaId, 'class' => 'reset'));
-?>
 </form>

views/explorer/index.ctp

@@ -32 +32 @@
                 ':SAVE': function() {
                   var $form = $('#form-meta-' + id);
+                  $.post($form.attr('action'), $form.serialize(), function(data) {
+                    $('#description-' + id).html(data);
+                    $('#description-' + id).find('.tooltip-actions').tooltipAction();
+                  });
+                  $(this).dialog("close");
+                },
+                ':CANCEL': function() {
+                  $(this).dialog("close");
+                }
+              }
+            });
+          }
+        });
+      });
+      $(this).find('ul li .acl').click(function() {
+        var $dialog = $('#dialog');
+        $.ajax(':BASE_URLexplorer/editacl/' + id, {
+          success: function(data, xhr, status) {
+            $dialog.children().remove();
+            $dialog.append(data);
+            $dialog.dialog({
+              modal: true, 
+              width: 520,
+              title: ':ACL_TITLE',
+              buttons: {
+                ':SAVE': function() {
+                  var $form = $('#form-acl-' + id);
                   $.post($form.attr('action'), $form.serialize(), function(data) {
                     $('#description-' + id).html(data);
@@ -118 +145 @@
     'BASE_URL' => Router::url('/', true), 
     'EDIT_TITLE' => __("Edit Meta Data", true),
+    'ACL_TITLE' => __("Edit Access Rights", true),
     'SAVE' => __("Update", true), 
     'CANCEL' => __("Cancel", true));

webroot/css/default/_form.sass

@@ -36 +36 @@
         width: 224px
         margin-top: 10px
+      select
+        +default-input
+        font-size: 12pt
+        margin-top: 10px
+        option
+          padding: 3px 0
+          font-size: 12pt
+          background-color: $clickable-default-bg
+          &.selected
+            background-color: $clickable-active-bg
+          &:hover
+            background-color: $clickable-hover-bg
       > img
         margin-top: 12px