[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Admin File Gallery: Add missing description field in listings panel

Bruno Kambere pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
c925c44f by Landry Bitege at 2026-06-06T12:05:59+03:00
[FIX] Admin File Gallery: Add missing description field in listings panel
---
* [FIX] Admin File Gallery: Add missing description field in listings panel

See merge request tikiwiki/tiki!10402

- - - - -


2 changed files:

- templates/admin/include_fgal.tpl
- templates/list_file_gallery_content.tpl


Changes:

=====================================
templates/admin/include_fgal.tpl
=====================================
@@ -28,7 +28,6 @@
             </fieldset>
 
             {preference name=home_file_gallery}
-            {preference name=fgal_list_description}
             {preference name='fgal_use_db'}
             <div class="adminoptionboxchild fgal_use_db_childcontainer n">
                 <div class="mb-sm-3">
@@ -214,6 +213,7 @@
             {preference name='fgal_show_ocr_state'}
             {preference name='fgal_list_id'}
             {preference name='fgal_list_type'}
+            {preference name='fgal_list_description'}
             {preference name='fgal_list_name'}
             {preference name='fgal_list_size'}
             {preference name='fgal_list_created'}


=====================================
templates/list_file_gallery_content.tpl
=====================================
@@ -90,7 +90,8 @@
 
                     {if !(empty($galleryId) and $propname eq 'lockedby') and ($propname neq 'name'
                         or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' )) and ($propname neq 'description'
-                        or $gal_info.show_name neq 'n')}
+                        or $gal_info.show_name neq 'n'
+                        or $gal_info.show_description eq 'y' or $gal_info.show_description eq 'a')}
                         {if isset($nbCols)}
                             {$nbCols=$nbCols+1}
                         {else}
@@ -399,7 +400,7 @@
                             {else}
                                 {$propval="<a class='fgalname' $link>$propval</a>"}
                             {/if}
-                            {if $propname eq 'name' and $gal_info.show_name eq 'n' and $gal_info.show_description neq 'n'}
+                            {if $propname eq 'name' and $gal_info.show_name eq 'n' and $gal_info.show_description eq 'o'}
                                 {if $gal_info.max_desc gt 0}
                                     {$desc=$files[changes].description|truncate:$gal_info.max_desc:"...":false|nl2br}
                                 {else}
@@ -504,7 +505,8 @@
                         {else}
                             {if !(empty($galleryId) and $propname eq 'lockedby') and ($propname neq 'name'
                                 or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' ))
-                                and ($propname neq 'description' or $gal_info.show_name neq 'n')}
+                                and ($propname neq 'description' or $gal_info.show_name neq 'n'
+                                    or $gal_info.show_description eq 'y' or $gal_info.show_description eq 'a')}
                                 <td>{$propval}</td>
                             {/if}
                         {/if}
@@ -537,7 +539,7 @@
                     </td>
                 {/if}
 
-                {if isset($other_columns) and isset($other_columns_selected) and ( $other_columns neq '' or $other_columns_selected neq '' )}
+                {if (isset($other_columns) and $other_columns neq '') or (isset($other_columns_selected) and $other_columns_selected neq '')}
                     <td>
                         {if $show_infos eq 'y'}
                             {if $over_infos eq ''}



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

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/c925c44fa2262f93265ca830a112ae39b79331d1
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