Changeset 17290 for branches/2.4/admin/batch_manager.php

Timestamp:

Aug 1, 2012, 7:00:07 PM (12 years ago)

Author:

rvelices

Message:

merge -r17289 from trunk to 2.4: batch manager improvements/fixes:

• when refreshing photo set, start is set to 0 (otherwise if the new set is smaller that start, it looks like it is empty)
• correct positioning of thumbnails (width/height) is done in template instead of javascript (immediate instead on ready + no reflows)
• less space lost on batch manager page
• fix wrong page title in batch manager because of global variable $title overriden
• fix language keys in element_set_ranks (capital/lowercase issue)

File:

• branches/2.4/admin/batch_manager.php (modified) (3 diffs)

branches/2.4/admin/batch_manager.php

@@ -51 +51 @@
 {
   // echo '<pre>'; print_r($_POST); echo '</pre>';
-
+  unset($_REQUEST['start']); // new photo set must reset the page
   $_SESSION['bulk_manager_filter'] = array();
 
@@ -336 +336 @@
 // and $page['nb_images'] next elements
 
-if (!isset($_GET['start'])
-    or !is_numeric($_GET['start'])
-    or $_GET['start'] < 0
-    or (isset($_GET['display']) and 'all' == $_GET['display']))
+if (!isset($_REQUEST['start'])
+    or !is_numeric($_REQUEST['start'])
+    or $_REQUEST['start'] < 0
+    or (isset($_REQUEST['display']) and 'all' == $_REQUEST['display']))
 {
   $page['start'] = 0;
@@ -345 +345 @@
 else
 {
-  $page['start'] = $_GET['start'];
+  $page['start'] = $_REQUEST['start'];
 }