From: <sy...@us...> - 2008-10-10 22:40:59
|
Revision: 15095 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15095&view=rev Author: sylvieg Date: 2008-10-10 22:40:50 +0000 (Fri, 10 Oct 2008) Log Message: ----------- backport sort in fgal Modified Paths: -------------- branches/2.0/tiki-admin_include_fgal.php branches/2.0/tiki-list_file_gallery.php Modified: branches/2.0/tiki-admin_include_fgal.php =================================================================== --- branches/2.0/tiki-admin_include_fgal.php 2008-10-10 22:35:59 UTC (rev 15094) +++ branches/2.0/tiki-admin_include_fgal.php 2008-10-10 22:40:50 UTC (rev 15095) @@ -113,7 +113,7 @@ $smarty->assign('fgal_sortorder', 'created'); $smarty->assign('fgal_sortdirection', 'desc'); } -$options_sortorder = array(tra('Creation Date')=>'created', tra('Name')=>'name', tra('Last modification date')=>'lastModif', tra('Hits')=>'hits', tra('Owner') => 'user', tra('Description') => 'description', tra('ID') => 'galleryId'); +$options_sortorder = array(tra('Creation Date')=>'created', tra('Name')=>'name', tra('Last modification date')=>'lastModif', tra('Hits')=>'hits', tra('Owner') => 'user', tra('Description') => 'description', tra('ID') => 'id'); $smarty->assign_by_ref('options_sortorder', $options_sortorder); $handlers = $filegallib->get_file_handlers(); Modified: branches/2.0/tiki-list_file_gallery.php =================================================================== --- branches/2.0/tiki-list_file_gallery.php 2008-10-10 22:35:59 UTC (rev 15094) +++ branches/2.0/tiki-list_file_gallery.php 2008-10-10 22:40:50 UTC (rev 15095) @@ -50,7 +50,8 @@ 'show_hits' => $prefs['fgal_list_hits'], 'show_lockedby' => $prefs['fgal_list_lockedby'], 'show_checked' => 'y', - 'show_userlink' => 'y' + 'show_userlink' => 'y', + 'sort_mode' => $prefs['fgal_sort_mode'] ); } @@ -668,8 +669,12 @@ $smarty->assign_by_ref('name', $gal_info["name"]); $smarty->assign_by_ref('description', $gal_info["description"]); -if ( ! isset($_REQUEST['sort_mode']) ) { - $_REQUEST['sort_mode'] = ( $gal_info['show_name'] == 'f' ? 'filename_asc' : 'name_asc' ); +if ( empty($_REQUEST['sort_mode']) ) { + if ($gal_info['sort_mode'] == 'name_asc' && $gal_info['show_name'] == 'f') { + $_REQUEST['sort_mode'] = 'filename_asc'; + } else { + $_REQUEST['sort_mode'] = $gal_info['sort_mode']; + } } $smarty->assign_by_ref('sort_mode', $_REQUEST['sort_mode']); @@ -744,7 +749,7 @@ */ -$options_sortorder = array(tra('Creation Date')=>'created', tra('Name')=>'name', tra('Last modification date')=>'lastModif', tra('Hits')=>'hits', tra('Owner') => 'user', tra('Description') => 'description', tra('ID') => 'galleryId'); +$options_sortorder = array(tra('Creation Date')=>'created', tra('Name')=>'name', tra('Last modification date')=>'lastModif', tra('Hits')=>'hits', tra('Owner') => 'user', tra('Description') => 'description', tra('ID') => 'id'); $smarty->assign_by_ref('options_sortorder', $options_sortorder); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |