[TikiWiki-commits] [Git][tikiwiki/tiki][master] [ENH][UI] Wiki attachments: replace often-empty Categories column with Uploaded by

ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
498bebcc by Moïse Nturubika at 2026-07-01T09:22:45+00:00
[ENH][UI] Wiki attachments: replace often-empty Categories column with Uploaded by
---
* [ENH][UI] Wiki attachments: replace always-empty Categories column with Uploaded by

See merge request tikiwiki/tiki!10607

- - - - -


2 changed files:

- lib/smarty_tiki/FunctionHandler/Attachments.php
- templates/list_file_gallery_content.tpl


Changes:

=====================================
lib/smarty_tiki/FunctionHandler/Attachments.php
=====================================
@@ -69,12 +69,13 @@ class Attachments extends Base
 
         $params['sort_mode'] = $_REQUEST[$url_override_prefix . '-sort_mode'] ?? '';
 
+        // Force some gallery display parameters before fgal_listing_conf.php reads $gal_info
+        $gal_info['show_checked'] = 'n';
+        $gal_info['show_creator'] = 'y';
+
         // Get listing display config
         include_once('fgal_listing_conf.php');
 
-        // Force some gallery display parameters
-        $gal_info['show_checked'] = 'n';
-
         // Get list of files in the gallery
         if (! empty($galleryId)) {
             $files = $filegallib->get_files(0, -1, $params['sort_mode'], '', $galleryId);


=====================================
templates/list_file_gallery_content.tpl
=====================================
@@ -147,7 +147,7 @@
                 </th>
             {/if}
             
-            {if ( $prefs.feature_categories eq 'y')}
+            {if ( $prefs.feature_categories eq 'y') and empty($from_wiki_page)}
                 {if isset($nbCols)}
                     {$nbCols=$nbCols+1}
                 {else}
@@ -525,7 +525,7 @@
                     {$file=$files[changes]}{* For fgal_context_menu.tpl. Cannot be an include parameter, because "file" is a reserved name. *}
                     <td>{include file='fgal_context_menu.tpl'}</td>
                 {/if}
-                {if ( $prefs.feature_categories eq 'y')}
+                {if ( $prefs.feature_categories eq 'y') and empty($from_wiki_page)}
                     <td>
                     {if !empty($files[changes].categories)}
                         {foreach from=$files[changes].categories item=cat name=cat}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/498bebcce72c2efcad268736c586e464670688b1

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/498bebcce72c2efcad268736c586e464670688b1
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs