From 1b60bafb587b68b2aaab4d634a62687d12a0f8c8 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Mon, 26 May 2014 16:56:39 +0000
Subject: feature 3077 : always sort categories by global rank

git-svn-id: http://piwigo.org/svn/trunk@28540 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/js/LocalStorageCache.js | 2 +-
 admin/themes/default/js/addAlbum.js          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'admin/themes/default/js')

diff --git a/admin/themes/default/js/LocalStorageCache.js b/admin/themes/default/js/LocalStorageCache.js
index c18171efc..b720851be 100644
--- a/admin/themes/default/js/LocalStorageCache.js
+++ b/admin/themes/default/js/LocalStorageCache.js
@@ -1,5 +1,5 @@
 var LocalStorageCache = function(options) {
-  this.key = options.key + '-' + options.serverId;
+  this.key = options.key + '_' + options.serverId;
   this.serverKey = options.serverKey;
   this.lifetime = options.lifetime ? options.lifetime*1000 : 3600*1000;
   this.loader = options.loader;
diff --git a/admin/themes/default/js/addAlbum.js b/admin/themes/default/js/addAlbum.js
index 60942d8a7..dec06532e 100644
--- a/admin/themes/default/js/addAlbum.js
+++ b/admin/themes/default/js/addAlbum.js
@@ -8,7 +8,7 @@ jQuery.fn.pwgAddAlbum = function(options) {
     $popup.find('[name="category_parent"]').selectize({
       valueField: 'id',
       labelField: 'fullname',
-      sortField: 'fullname',
+      sortField: 'global_rank',
       searchField: ['fullname'],
       plugins: ['remove_button'],
       onInitialize: function() {
@@ -107,7 +107,8 @@ jQuery.fn.pwgAddAlbum = function(options) {
       options.cache.get(function(categories) {
         categories.push({
           id: 0,
-          fullname: '------------'
+          fullname: '------------',
+          global_rank: 0
         });
         
         albumParent.selectize.load(function(callback) {
-- 
cgit v1.2.3