Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix moving sessions list columns and proper closing of loading message on request errors

Browse source
This commit is contained in:
Aleksander Machniak 2016-02-02 18:53:40 +01:00
parent 1f88231db9
commit 2f3e9f960c
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/kolab_files/kolab_files.js
View file

@ -1708,7 +1708,7 @@ rcube_webmail.prototype.sessions_list_update = function(head)
var list = this.sessionslist; var list = this.sessionslist;
$('thead', list.fixed_header ? list.fixed_header : list.list).html(head); $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
kolab_files_list_coltypes(); kolab_files_list_coltypes('sessions');
file_api.sessions_list(); file_api.sessions_list();
}; };
@ -1912,9 +1912,9 @@ function kolab_files_ui()
return rcmail.display_message(this.t(label), type); return rcmail.display_message(this.t(label), type);
}; };
this.http_error = function(request, status, err) this.http_error = function(request, status, err, data)
{ {
rcmail.http_error(request, status, err); rcmail.http_error(request, status, err, data ? data.req_id : null);
}; };
// check if specified/current folder/view is writable // check if specified/current folder/view is writable

5
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -680,10 +680,11 @@ class kolab_files_engine
protected function list_update($prefs, $type = 'files') protected function list_update($prefs, $type = 'files')
{ {
$prefix = 'kolab_' . $type . '_list_'; $prefix = 'kolab_' . $type . '_list_';
$c_prefix = 'kolab_files' . ($type != 'files' ? '_' . $type : '') . '_list_';
$attrib = $_SESSION[$prefix . 'attrib']; $attrib = $_SESSION[$prefix . 'attrib'];
if (!empty($prefs[$prefix . 'cols'])) { if (!empty($prefs[$c_prefix . 'cols'])) {
$attrib['columns'] = $prefs[$prefix . 'cols']; $attrib['columns'] = $prefs[$c_prefix . 'cols'];
$_SESSION[$prefix . 'attrib'] = $attrib; $_SESSION[$prefix . 'attrib'] = $attrib;
} }