merge r12872 from trunk

bug:2540 When default photos order is only by rank, failure outside albums

git-svn-id: http://piwigo.org/svn/branches/2.3@13037 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 29 insertions, 9 deletions

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 205d5ffb0..c0070b1a5 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -115,24 +115,44 @@
     </li>
     
 {if !$ORDER_BY_IS_CUSTOM}
-{footer_script require='jquery'}{literal}
+{footer_script require='jquery'}
+// counters for displaying of addFilter link
+fields = {$main.order_by|@count}; max_fields = {$main.order_field_options|@count}; max_fields--;
+
+{literal}
+function updateAddFilterLink() {
+  if (fields >= max_fields) {
+    $('.addFilter').css('display', 'none');
+  } else {
+    $('.addFilter').css('display', '');
+  }
+}
+
+function updateRemoveFilterTrigger() {
+  $(".removeFilter").click(function () {
+    $(this).parent('span.filter').remove();
+    fields--;
+    updateAddFilterLink();
+  });
+}
+
 jQuery(document).ready(function () {
   $('.addFilter').click(function() {
     rel = $(this).attr('rel');
     $(this).prev('span.filter').clone().insertBefore($(this));
     $(this).prev('span.filter').children('select[name="order_by_field[]"]').val('');
     $(this).prev('span.filter').children('select[name="order_by_direction[]"]').val('ASC');
-      
-    $(".removeFilter").click(function () {
-      $(this).parent('span.filter').remove();
-    });
+    
+    fields++;
+    updateAddFilterLink();  
+    updateRemoveFilterTrigger();
   });
   
-  $(".removeFilter").click(function () {
-    $(this).parent('span.filter').remove();
-  });
+  updateRemoveFilterTrigger();
+  updateAddFilterLink();
 });
-{/literal}{/footer_script}
+{/literal}
+{/footer_script}
 {/if}
   </ul>
 </fieldset>