Changeset 2202:beec29418927 for admin

Timestamp:

10/02/13 13:01:53 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Allow to remove severals medias in one action. Addresses #399
Don't manage directories.

---
Fix indentation in lib.dc.page.php

Location:

admin

Files:

• js/_media.js (modified) (3 diffs)
• media.php (modified) (5 diffs)

admin/js/_media.js

@@ -69 +69 @@
                     if (data.result.files[0].html !==undefined) {
                          $('.media-list .files-group').append(data.result.files[0].html);
+                         $('#form-medias .hide').removeClass('hide');
                     }
                     $('.button.clean',me).show();
@@ -130 +131 @@
      $('#fileupload').enhancedUploader();
 
+     $('.checkboxes-helpers').each(function() {
+          dotclear.checkboxesHelpers(this);
+     });
+
+     $('#form-medias').submit(function() {
+          var count_checked = $('input[name="medias[]"]:checked', $(this)).length;
+          console.log('count: ', count_checked);
+          if (count_checked==0) {
+               return false;
+          }
+
+          return window.confirm(dotclear.msg.confirm_delete_medias.replace('%d',count_checked));
+     });
+
      // Replace remove links by a POST on hidden form
      fileRemoveAct();
@@ -135 +150 @@
      function fileRemoveAct() {
           $('body').on('click','a.media-remove',function() {
-               var m_name = $(this).parents('ul').find('li:first>a').text();
+               var m_name = $(this).parents('.media-item').find('a.media-link').text();
                if (window.confirm(dotclear.msg.confirm_delete_media.replace('%s',m_name))) {
                     var f = $('#media-remove-hide').get(0);

admin/media.php

@@ -180 +180 @@
 }
 
-# Removing item
+# Removing items
+if ($dir && !empty($_POST['medias']) && !empty($_POST['delete_medias'])) {
+     try {
+          foreach ($_POST['medias'] as $media) {
+               $core->media->removeItem(rawurldecode($media));
+          }
+          dcPage::addSuccessNotice(
+               sprintf(__('Successfully delete one media.',
+                            'Successfully delete %d medias.',
+                            count($_POST['medias'])
+                            ),
+                            count($_POST['medias'])
+               )
+          );
+          http::redirect($page_url.'&d='.rawurlencode($d));
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
+# Removing item from popup only
 if ($dir && !empty($_POST['rmyes']) && !empty($_POST['remove']))
 {
@@ -322 +342 @@
 
 $items = array_values(array_merge($dir['dirs'],$dir['files']));
+
+$fmt_form_media = '<form action="media.php" method="post" id="form-medias">'.
+     '<div class="files-group">%s</div>'.
+     '<p>'.$core->formNonce() . form::hidden(array('d'),$d).'</p>'.
+     '<div class="two-cols%s">'.
+     '<p class="col checkboxes-helpers"></p>'.
+     '<p class="col right"><input type="submit" class="delete" name="delete_medias" value="'.__('Remove selected medias').'"/></p>'.
+     '</div>'.
+     '</form>';
+
 echo '<div class="media-list">';
 if (count($items) == 0)
@@ -327 +357 @@
      echo 
      '<p>'.__('No file.').'</p>'.
-     '<div class="files-group"></div>'; // need for jsUpload to append new media 
+     sprintf($fmt_form_media,'',' hide'); // need for jsUpload to append new media
 }
 else
@@ -356 +386 @@
           }
      }
+     
      echo 
-          ($dgroup != '' ? '<div class="folders-group">'.$dgroup.'</div>' : '').
-          '<div class="files-group">'.$fgroup.'</div>';
+     ($dgroup != '' ? '<div class="folders-group">'.$dgroup.'</div>' : '').
+     sprintf($fmt_form_media,$fgroup,'');
      
      echo $pager->getLinks();
@@ -551 +582 @@
      
      if ($f->del) {
-          $act .= '<a class="media-remove" '.
-          'href="'.html::escapeURL($page_url).'&amp;d='.
-          rawurlencode($GLOBALS['d']).'&amp;remove='.rawurlencode($f->basename).'">'.
-          '<img src="images/trash.png" alt="'.__('Delete').'" title="'.__('delete').'" /></a>';
+          if (!$popup && !$f->d) {
+               $act .= form::checkbox(array('medias[]', 'media_'.rawurlencode($f->basename)),rawurlencode($f->basename));
+          } else {
+               $act .= '<a class="media-remove" '.
+               'href="'.html::escapeURL($page_url).'&amp;d='.
+               rawurlencode($GLOBALS['d']).'&amp;remove='.rawurlencode($f->basename).'">'.
+               '<img src="images/trash.png" alt="'.__('Delete').'" title="'.__('delete').'" /></a>';
+          }
      }