Changeset 11853 for trunk/admin

Timestamp:

Jul 30, 2011, 6:49:02 AM (13 years ago)

Author:

rvelices

Message:

feature 2387: addd a filter by tag in the batch manager

Location:

trunk/admin

Files:

• batch_manager.php (modified) (3 diffs)
• batch_manager_global.php (modified) (1 diff)
• batch_manager_unit.php (modified) (1 diff)
• include/functions.php (modified) (5 diffs)
• picture_modify.php (modified) (2 diffs)
• themes/default/template/batch_manager_global.tpl (modified) (4 diffs)

trunk/admin/batch_manager.php

@@ -67 +67 @@
       $_SESSION['bulk_manager_filter']['category_recursive'] = true;
     }
+  }
+
+  if (isset($_POST['filter_tags_use']))
+  {
+    $_SESSION['bulk_manager_filter']['tags'] = get_tag_ids($_POST['filter_tags'], false);
   }
 
@@ -291 +296 @@
 }
 
+if (!empty($_SESSION['bulk_manager_filter']['tags']))
+{
+        $query = '
+SELECT image_id
+        FROM '.IMAGE_TAG_TABLE.
+        'WHERE tag_id IN('.implode(',',$_SESSION['bulk_manager_filter']['tags']).')
+        GROUP BY image_id
+        HAVING COUNT(tag_id)='.count($_SESSION['bulk_manager_filter']['tags']);
+        array_push(
+    $filter_sets,
+                get_image_ids_for_tags($_SESSION['bulk_manager_filter']['tags'])
+                );
+}
+
 $current_set = array_shift($filter_sets);
 foreach ($filter_sets as $set)
@@ -366 +385 @@
 
 $query = '
-SELECT
-    id AS tag_id,
-    name AS tag_name
+SELECT id, name
   FROM '.TAGS_TABLE.'
 ;';

trunk/admin/batch_manager_global.php

@@ -538 +538 @@
     )
   );
+
+if (!empty($_SESSION['bulk_manager_filter']['tags']))
+{
+        $query = '
+SELECT id, name
+        FROM '.TAGS_TABLE.'
+        WHERE id IN ('.implode(',', $_SESSION['bulk_manager_filter']['tags']).')';
+        $template->assign('filter_tags', get_taglist($query));
+}
 
 // Virtualy associate a picture to a category

trunk/admin/batch_manager_unit.php

@@ -252 +252 @@
     $query = '
 SELECT
-    tag_id,
-    name AS tag_name
+    id,
+    name
   FROM '.IMAGE_TAG_TABLE.' AS it
     JOIN '.TAGS_TABLE.' AS t ON t.id = it.tag_id

trunk/admin/include/functions.php

@@ -2049 +2049 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['tag_name'], $matches))
+    if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches))
     {
       foreach ($matches[2] as $tag_name)
@@ -2057 +2057 @@
           array(
             'name' => trigger_event('render_tag_name', $tag_name),
-            'id' => '~~'.$row['tag_id'].'~~',
+            'id' => '~~'.$row['id'].'~~',
             )
           );
@@ -2065 +2065 @@
     }
     
-    if (strlen($row['tag_name']) > 0)
+    if (strlen($row['name']) > 0)
     {
       array_push(
         $taglist,
         array(
-          'name' => trigger_event('render_tag_name', $row['tag_name']),
-          'id' => '~~'.$row['tag_id'].'~~',
+          'name' => trigger_event('render_tag_name', $row['name']),
+          'id' => '~~'.$row['id'].'~~',
           )
         );
@@ -2083 +2083 @@
 }
 
-function get_tag_ids($raw_tags)
+function get_tag_ids($raw_tags, $allow_create=true)
 {
   // In $raw_tags we receive something like array('~~6~~', '~~59~~', 'New
@@ -2099 +2099 @@
       array_push($tag_ids, $matches[1]);
     }
-    else
+    elseif ($allow_create)
     {
       // we have to create a new tag
-      array_push(
-        $tag_ids,
-        tag_id_from_tag_name($raw_tag)
-        );
+      $tag_ids[] = tag_id_from_tag_name($raw_tag);
     }
   }

trunk/admin/picture_modify.php

@@ -228 +228 @@
 $query = '
 SELECT
-    tag_id,
-    name AS tag_name
+    id,
+    name
   FROM '.IMAGE_TAG_TABLE.' AS it
     JOIN '.TAGS_TABLE.' AS t ON t.id = it.tag_id
@@ -238 +238 @@
 $query = '
 SELECT
-    id AS tag_id,
-    name AS tag_name
+    id,
+    name
   FROM '.TAGS_TABLE.'
 ;';

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -12 +12 @@
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
+        var tag_src = [{foreach from=$tags item=tag name=tags}{ldelim}name:"{$tag.name|@escape:'javascript'}",id:"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}];
   jQuery("#tags").tokenInput(
-    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}],
+    tag_src,
     {ldelim}
       hintText: '{'Type in a search term'|@translate}',
@@ -24 +25 @@
     }
   );
+        
+  jQuery("#tagsFilter").tokenInput(
+    tag_src,
+    {ldelim}
+      hintText: '{'Type in a search term'|@translate}',
+      noResultsText: '{'No results'|@translate}',
+      searchingText: '{'Searching...'|@translate}',
+      animateDropdown: false,
+      preventDuplicates: true,
+      allowCreation: false
+    }
+  );
+
 });
 {/footer_script}
@@ -467 +481 @@
         <label><input type="checkbox" name="filter_category_recursive" {if isset($filter.category_recursive)}checked="checked"{/if}> {'include child albums'|@translate}</label>
       </li>
+                        <li id="filter_tags" {if !isset($filter.tags)}style="display:none"{/if}>
+                                <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
+                                <input type="checkbox" name="filter_tags_use" class="useFilterCheckbox" {if isset($filter.tags)}checked="checked"{/if}>
+                                {'Tags'|@translate}
+                                <select id="tagsFilter" name="filter_tags">
+                                        {foreach from=$filter_tags item=tag}
+                                        <option value="{$tag.id}">{$tag.name}</option>
+                                        {/foreach}
+                                </select>
+                        </li>
       <li id="filter_level" {if !isset($filter.level)}style="display:none"{/if}>
         <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
@@ -483 +507 @@
         <option value="filter_prefilter">{'predefined filter'|@translate}</option>
         <option value="filter_category">{'album'|@translate}</option>
+                                <option value="filter_tags">{'Tags'|@translate}</option>
         <option value="filter_level">{'Who can see these photos?'|@translate}</option>
       </select>