Changeset 23719 for extensions/UserCollections

Timestamp:

Jul 1, 2013, 1:27:17 PM (11 years ago)

Author:

mistic100

Message:

fix mysql error when no photos on the page, remove "create collection" link in menu

Location:

extensions/UserCollections

Files:

• include/events.inc.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (1 diff)
• template/menublock.tpl (modified) (1 diff)

extensions/UserCollections/include/events.inc.php

@@ -73 +73 @@
   
   // the content is different on collection edition page and no button on batch downloader set edition page
-  if ( (@$page['section'] == 'collections' and @$page['sub_section']=='edit') or @$page['section'] == 'download')
+  if ( empty($pictures) or (@$page['section'] == 'collections' and @$page['sub_section']=='edit') or @$page['section'] == 'download')
   {
     return $tpl_thumbnails_var;
@@ -246 +246 @@
     
     $data['U_LIST'] = USER_COLLEC_PUBLIC;
-    $data['U_CREATE'] = add_url_params(USER_COLLEC_PUBLIC, array('action'=>'new','col_id'=>'0','redirect'=>'true'));
     
     $block->set_title('<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>');

extensions/UserCollections/include/ws_functions.inc.php

@@ -82 +82 @@
         'default'=>array('id','name','url','path'),
         'flags'=>WS_PARAM_FORCE_ARRAY,
-        'info'=>'Available options are: id, file, name, url, path, ate_creation, collection_add_date, filesize, width, height'
+        'info'=>'Available options are: id, file, name, url, path, date_creation, collection_add_date, filesize, width, height'
         ),
       ),

extensions/UserCollections/template/menublock.tpl

@@ -1 +1 @@
 <dt>{$block->get_title()}</dt>
 <dd>
-  <p>
+  <p>{strip}
     {if $block->data.NB_COL == 0}
       {'You have no collection'|@translate}
     {else}
       <a href="{$block->data.U_LIST}">{$pwg->l10n_dec('You have %d collection', 'You have %d collections', $block->data.NB_COL)}</a>
-    {/if}</p>
+    {/if}
+  {/strip}</p>
   {if $block->data.collections}
-  <ul>{strip}
-                {foreach from=$block->data.collections item=col}
+  <ul>
+                {foreach from=$block->data.collections item=col}{strip}
                 <li>
-      <a href="{$col.u_edit}" rel="nofollow">{$col.name}</a>&nbsp; 
+      <a href="{$col.u_edit}">{$col.name}</a>&nbsp; 
       <span class="menuInfoCat">[<span class="nbImagesCollec-{$col.id}">{$col.nb_images}</span>]</span>
     </li>
-                {/foreach}
+                {/strip}{/foreach}
     {if isset($block->data.MORE)}<li class="menuInfoCat"><a href="{$block->data.U_LIST}">{'%d more...'|@translate|sprintf:$block->data.MORE}</a></li>{/if}
-        {/strip}</ul>
+        </ul>
   {/if}
-  <p><a href="{$block->data.U_CREATE}" rel="nofollow">{'Create a new collection'|@translate}</a></p>
 </dd>