Changeset 11623 for extensions

Timestamp:

Jul 4, 2011, 4:14:36 PM (13 years ago)

Author:

Mattias

Message:

Several bugfixes in batch_single.php

Location:

extensions/Copyrights

Files:

• TODO (modified) (2 diffs)
• batch_single.php (modified) (3 diffs)

extensions/Copyrights/TODO

@@ -4 +4 @@
         SOURCES: "loc_begin_admin": http://piwigo.org/forum/viewtopic.php?id=17468
                          "use prefilters": http://piwigo.org/forum/viewtopic.php?id=17551&p=2
+        - This is almost done, except that you need to refresh the batch_unit page, to see the updated copyright
 - Add Icon field to copyrights
 - Show the copyright when image is displayed
@@ -12 +13 @@
         - Description doesnt show with the copyright info (on the admin page)
         - The warning triangle saying our plugin does not seem compatible (version: ...)
-        - Cannot create a new copyright???
+        - Cannot create a new copyright??? (i assume its fixed, but Johan did, so he can remove the todo ;-) )

extensions/Copyrights/batch_single.php

@@ -3 +3 @@
 // Add a prefilter
 add_event_handler('loc_end_element_set_unit', 'CR_set_prefilter_batch_single', 55 );
-add_event_handler('loc_end_element_set_unit', 'CR_batch_single_submit', 55 );
+add_event_handler('loc_end_element_set_unit', 'CR_batch_single_submit', 50 );
 
 // Change the variables used by the function that changes the template
-add_event_handler('loc_begin_admin', 'CR_add_batch_single_vars_to_template');
+add_event_handler('loc_end_element_set_unit', 'CR_add_batch_single_vars_to_template');
 
 function CR_set_prefilter_batch_single()
@@ -21 +21 @@
         $replacement = '<td><strong>{\'Copyright\'|@translate}</strong></td>
                 <td>
-                        {html_options name=copyright-{$element.ID} options=$CRoptions}
+                        <select id="copyright-{$element.ID}" name="copyright-{$element.ID}">
+                                <option value="0">--</option>
+                                {html_options options=$CRoptions selected=$CRcopyrights[$element.ID]}
+                        </select>
                 </td>
         </tr>
@@ -55 +58 @@
         }
         $template->assign('CRoptions', $CRoptions);
+        
+        // Get the copyright for each element
+        $query = sprintf(
+                'SELECT `media_id`, `cr_id`
+                FROM %s
+                ;',
+                COPYRIGHTS_MEDIA);
+        $result = pwg_query($query);
+        
+        $CRcopyrights = array();
+        while ($row = pwg_db_fetch_assoc($result)) {
+                $CRcopyrights[$row['media_id']] = $row['cr_id'];
+        }
+        $template->assign('CRcopyrights', $CRcopyrights);
 }
 
 function CR_batch_single_submit()
 {
-        // The image id's:
-        $collection = explode(',', $_POST['element_ids']);
+        if (isset($_POST['submit']))
+        {
+                // The image id's:
+                $collection = explode(',', $_POST['element_ids']);
 
-        // Delete all existing id's of which the Copyright is going to be set
-        if (count($collection) > 0) {
-                $query = sprintf(
-                        'DELETE
-                        FROM %s
-                        WHERE media_id IN (%s)
-                        ;',
-                        COPYRIGHTS_MEDIA, implode(',', $collection));
-                pwg_query($query);
-        }
-        // Add all Copyrights to an array
-        $edits = array();
-        foreach ($collection as $image_id) {
-                // The copyright id's
-                $crID = pwg_db_real_escape_string($_POST['copyrightID-'.$image_id]);
+                // Delete all existing id's of which the Copyright is going to be set
+                if (count($collection) > 0) {
+                        $query = sprintf(
+                                'DELETE
+                                FROM %s
+                                WHERE media_id IN (%s)
+                                ;',
+                                COPYRIGHTS_MEDIA, implode(',', $collection));
+                        pwg_query($query);
+                }
+                // Add all Copyrights to an array
+                $edits = array();
+                foreach ($collection as $image_id) {
+                        // The copyright id's
+                        $crID = pwg_db_real_escape_string($_POST['copyright-'.$image_id]);
 
-                array_push(
-                        $edits,
-                        array(
-                                'media_id' => $image_id,
-                                'cr_id' => $crID,
-                        )
+                        array_push(
+                                $edits,
+                                array(
+                                        'media_id' => $image_id,
+                
+                'cr_id' => $crID,
+                                )
+                        );
+                }
+                // Add the array to the database
+                mass_inserts(
+                        COPYRIGHTS_MEDIA,        // Table name
+                        array_keys($edits[0]),   // Columns
+                        $edits                   // Data
                 );
         }
-        // Add the array to the database
-        mass_inserts(
-                COPYRIGHTS_MEDIA,        // Table name
-                array_keys($edits[0]),   // Columns
-                $edits                   // Data
-        );
 }