From a5b2cf82007ac1b2461ba86b79c48e43c2640053 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Mon, 26 May 2014 22:03:57 +0000
Subject: feature 3077 : factorize code for categories cache (TODO for other
 collections) + fix incorrect categories list for dissociation

git-svn-id: http://piwigo.org/svn/trunk@28542 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 .../default/template/batch_manager_global.tpl      | 59 ++++++++--------------
 1 file changed, 21 insertions(+), 38 deletions(-)

(limited to 'admin/themes/default/template/batch_manager_global.tpl')

diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 4a45cab41..a5a48e8de 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -119,46 +119,31 @@ jQuery(document).ready(function() {ldelim}
   });
   
   {* <!-- CATEGORIES --> *}
-  var categoriesCache = new LocalStorageCache({
-    key: 'categoriesAdminList',
+  var categoriesCache = new CategoriesCache({
     serverKey: '{$CACHE_KEYS.categories}',
     serverId: '{$CACHE_KEYS._hash}',
-
-    loader: function(callback) {
-      jQuery.getJSON('{$ROOT_URL}ws.php?format=json&method=pwg.categories.getAdminList', function(data) {
-        callback(data.result.categories);
-      });
-    }
+    rootUrl: '{$ROOT_URL}'
   });
   
-  jQuery('[data-selectize=categories]').selectize({
-    valueField: 'id',
-    labelField: 'fullname',
-    sortField: 'global_rank',
-    searchField: ['fullname'],
-    plugins: ['remove_button']
-  });
-  
-  categoriesCache.get(function(categories) {
-    jQuery('[data-selectize=categories]').each(function() {
-      this.selectize.load(function(callback) {
-        callback(categories);
-      });
-
-      if (jQuery(this).data('value')) {
-        this.selectize.setValue(jQuery(this).data('value')[0]);
+  categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
+    filter: function(categories, options) {
+      if (this.name == 'dissociate') {
+        var filtered = jQuery.grep(categories, function(cat) {
+          return !cat.dir;
+        });
+        
+        if (filtered.length > 0) {
+          jQuery('.albumDissociate').show();
+          options.default = filtered[0].id;
+        }
+        
+        return filtered;
       }
-      
-      // prevent empty value
-      if (this.selectize.getValue() == '') {
-        this.selectize.setValue(categories[0].id);
+      else {
+        options.default = categories[0].id;
+        return categories;
       }
-      this.selectize.on('dropdown_close', function() {
-        if (this.getValue() == '') {
-          this.setValue(categories[0].id);
-        }
-      });
-    });
+    }
   });
   
   jQuery('[data-add-album]').pwgAddAlbum({ cache: categoriesCache });
@@ -837,9 +822,7 @@ UL.thumbnails SPAN.wrap2 {ldelim}
       <option value="delete" class="icon-trash">{'Delete selected photos'|@translate}</option>
       <option value="associate">{'Associate to album'|@translate}</option>
       <option value="move">{'Move to album'|@translate}</option>
-  {if !empty($dissociate_options)}
-      <option value="dissociate">{'Dissociate from album'|@translate}</option>
-  {/if}
+      <option value="dissociate" class="albumDissociate" style="display:none">{'Dissociate from album'|@translate}</option>
       <option value="add_tags">{'Add tags'|@translate}</option>
   {if !empty($associated_tags)}
       <option value="del_tags">{'remove tags'|@translate}</option>
@@ -884,7 +867,7 @@ UL.thumbnails SPAN.wrap2 {ldelim}
 
 
     <!-- dissociate -->
-    <div id="action_dissociate" class="bulkAction">
+    <div id="action_dissociate" class="bulkAction albumDissociate" style="display:none">
       <select data-selectize="categories" name="dissociate" style="width:400px"></select>
     </div>
 
-- 
cgit v1.2.3