archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 3077 : always sort categories by global rank

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@28540 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2014-05-26 16:56:39 +00:00
parent 2f62865ac1
commit 1b60bafb58
6 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/themes/default/js/LocalStorageCache.js
View file

@ -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;

5
admin/themes/default/js/addAlbum.js
View file

@ -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) {

6
admin/themes/default/template/batch_manager_global.tpl
View file

@ -134,16 +134,12 @@ jQuery(document).ready(function() {ldelim}
jQuery('[data-selectize=categories]').selectize({
valueField: 'id',
labelField: 'fullname',
sortField: 'fullname',
sortField: 'global_rank',
searchField: ['fullname'],
plugins: ['remove_button']
});
categoriesCache.get(function(categories) {
categories.sort(function(a, b) {
return a.fullname.localeCompare(b.fullname);
});
jQuery('[data-selectize=categories]').each(function() {
this.selectize.load(function(callback) {
callback(categories);

13
admin/themes/default/template/cat_modify.tpl
View file

@ -20,7 +20,7 @@ var categoriesCache = new LocalStorageCache({
jQuery('[data-selectize=categories]').selectize({
valueField: 'id',
labelField: 'fullname',
sortField: 'fullname',
sortField: 'global_rank',
searchField: ['fullname'],
plugins: ['remove_button']
});
@ -28,7 +28,8 @@ jQuery('[data-selectize=categories]').selectize({
categoriesCache.get(function(categories) {
categories.push({
id: 0,
fullname: '------------'
fullname: '------------',
global_rank: 0
});
// remove itself and children
@ -36,10 +37,6 @@ categoriesCache.get(function(categories) {
return !(/\b{$CAT_ID}\b/.test(cat.uppercats));
});
categories.sort(function(a, b) {
return a.fullname.localeCompare(b.fullname);
});
jQuery('[data-selectize=categories]').each(function() {
this.selectize.load(function(callback) {
callback(categories);
@ -51,11 +48,11 @@ categoriesCache.get(function(categories) {
// prevent empty value
if (this.selectize.getValue() == '') {
this.selectize.setValue(categories[0].id);
this.selectize.setValue(0);
}
this.selectize.on('dropdown_close', function() {
if (this.getValue() == '') {
this.setValue(categories[0].id);
this.setValue(0);
}
});
});

6
admin/themes/default/template/photos_add_direct.tpl
View file

@ -31,7 +31,7 @@ var categoriesCache = new LocalStorageCache({
jQuery('[data-selectize=categories]').selectize({
valueField: 'id',
labelField: 'fullname',
sortField: 'fullname',
sortField: 'global_rank',
searchField: ['fullname'],
plugins: ['remove_button']
});
@ -40,10 +40,6 @@ categoriesCache.get(function(categories) {
if (categories.length > 0) {
jQuery("#albumSelection").show();
}
categories.sort(function(a, b) {
return a.fullname.localeCompare(b.fullname);
});
jQuery('[data-selectize=categories]').each(function() {
this.selectize.load(function(callback) {

2
admin/themes/default/template/picture_modify.tpl
View file

@ -25,7 +25,7 @@ var categoriesCache = new LocalStorageCache({
jQuery('[data-selectize=categories]').selectize({
valueField: 'id',
labelField: 'fullname',
sortField: 'fullname',
sortField: 'global_rank',
searchField: ['fullname'],
plugins: ['remove_button']
});