From 0f6eeed9cadc93c255a7c2fc2e6fa7fa37882e74 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Fri, 16 Jan 2015 17:07:18 +0000 Subject: [PATCH] For filemanager index, store current view (tile/row) as implicit preference --- .../inc/class.filemanager_favorite_portlet.inc.php | 2 +- filemanager/inc/class.filemanager_ui.inc.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/filemanager/inc/class.filemanager_favorite_portlet.inc.php b/filemanager/inc/class.filemanager_favorite_portlet.inc.php index f26dd92e8d..7ecd06ba63 100644 --- a/filemanager/inc/class.filemanager_favorite_portlet.inc.php +++ b/filemanager/inc/class.filemanager_favorite_portlet.inc.php @@ -31,7 +31,7 @@ class filemanager_favorite_portlet extends home_favorite_portlet $ui = new filemanager_ui(); $this->nm_settings += array( - 'get_rows' => 'filemanager.filemanager_ui.get_rows', + 'get_rows' => 'filemanager.filemanager_favorite_portlet.get_rows', 'csv_export' => true, // Use a different template so it can be accessed from client side 'template' => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows' ), diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index 4647ef7534..814b78779f 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -300,6 +300,7 @@ class filemanager_ui $content['nm']['path'] = static::get_home_dir(); } $content['nm']['home_dir'] = static::get_home_dir(); + $content['nm']['view'] = $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view']; if (isset($_GET['msg'])) $msg = $_GET['msg']; @@ -782,6 +783,13 @@ class filemanager_ui if($query['view']) { $query['template'] = ($query['view'] == 'row' ? 'filemanager.index.rows' : 'filemanager.tile'); + + // Store as preference but only for index, not home + if($query['get_rows'] == 'filemanager.filemanager_ui.get_rows') + { + $GLOBALS['egw']->preferences->add('filemanager','nm_view',$query['view']); + $GLOBALS['egw']->preferences->save_repository(); + } } // be tolerant with (in previous versions) not correct urlencoded pathes if (!egw_vfs::stat($query['path'],true) && egw_vfs::stat(urldecode($query['path'])))