holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not give an error about selecting contacts when there is no action.

Browse Source 
r53709: Fix admin changing their columns set the default for all users
This commit is contained in:
Nathan Gray 2015-09-22 16:03:33 +00:00
parent 77f3d45e9d
commit 9c699bc8e2
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -135,7 +135,7 @@ class addressbook_ui extends addressbook_bo
$content['nm']['action'] = 'document';
$content['nm']['selected'] = array($id);
}
if ($content['nm']['action'] !== '')
if ($content['nm']['action'] !== '' && $content['nm']['action'] !== null)
{
if (!count($content['nm']['selected']) && !$content['nm']['select_all'] && $content['nm']['action'] != 'delete_list')
{

12
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -1053,7 +1053,17 @@ class etemplate_widget_nextmatch extends etemplate_widget
{
$pref_name = 'nextmatch-' . (isset($content_value['columnselection_pref']) ? $content_value['columnselection_pref'] : $this->attrs['template']);
$refresh_pref_name = $pref_name.'-autorefresh';
$pref_level = $value['nm_col_preference'] == 'force' ? 'forced' : 'default';
switch($value['nm_col_preference']) {
case 'force':
$pref_level = 'forced';
break;
case 'reset':
case 'default':
$pref_level = 'default';
break;
default:
$pref_level = 'user';
}
// Clear forced pref before setting default
if($pref_level != 'forced')

12
etemplate/js/et2_extension_nextmatch.js
View File

@ -1421,15 +1421,13 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
// Auto refresh
self._set_autorefresh(autoRefresh.get_value());
// Set default or clear forced?
if(defaultCheck.get_value())
// Set default or clear forced
if(show_letters)
{
if(show_letters)
{
self.activeFilters.selectcols.push('lettersearch');
}
self.getInstanceManager().submit();
self.activeFilters.selectcols.push('lettersearch');
}
self.getInstanceManager().submit();
self.selectPopup = null;
};