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

Fix template/code tab ID mismatch, which was breaking tab readonlys

Browse Source 
Fix 'owner' select box option conflict by changing eacl owner ID
This commit is contained in:
Nathan Gray 2014-04-23 19:49:17 +00:00
parent 85df315cbd
commit d401f141a9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -1038,13 +1038,13 @@ class filemanager_ui
} }
elseif ($button == 'eacl') elseif ($button == 'eacl')
{ {
if (!$content['eacl']['owner']) if (!$content['eacl_owner'])
{ {
$msg .= lang('You need to select an owner!'); $msg .= lang('You need to select an owner!');
} }
else else
{ {
$msg .= egw_vfs::eacl($path,$content['eacl']['rights'],$content['eacl']['owner']) ? $msg .= egw_vfs::eacl($path,$content['rights'],$content['eacl_owner']) ?
lang('ACL added.') : lang('Error adding the ACL!'); lang('ACL added.') : lang('Error adding the ACL!');
} }
} }
@ -1073,7 +1073,7 @@ class filemanager_ui
} }
$readonlys['name'] = $path == '/' || !egw_vfs::is_writable(egw_vfs::dirname($path)); $readonlys['name'] = $path == '/' || !egw_vfs::is_writable(egw_vfs::dirname($path));
$readonlys['comment'] = !egw_vfs::is_writable($path); $readonlys['comment'] = !egw_vfs::is_writable($path);
$readonlys['tabs']['preview'] = $readonlys['tabs']['perms'] = $content['is_link']; $readonlys['tabs']['filemanager.file.preview'] = $readonlys['tabs']['filemanager.file.perms'] = $content['is_link'];
// if neither owner nor is writable --> disable save&apply // if neither owner nor is writable --> disable save&apply
$readonlys['button[save]'] = $readonlys['button[apply]'] = !$content['is_owner'] && !egw_vfs::is_writable($path); $readonlys['button[save]'] = $readonlys['button[apply]'] = !$content['is_owner'] && !egw_vfs::is_writable($path);
@ -1089,10 +1089,10 @@ class filemanager_ui
$readonlys['#'.$name] = true; $readonlys['#'.$name] = true;
} }
} }
$readonlys['tabs']['eacl'] = true; // eacl off by default $readonlys['tabs']['filemanager.file.eacl'] = true; // eacl off by default
if ($content['is_dir']) if ($content['is_dir'])
{ {
$readonlys['tabs']['preview'] = true; // no preview tab for dirs $readonlys['tabs']['filemanager.file.preview'] = true; // no preview tab for dirs
$sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array( $sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
7 => lang('Display and modification of content'), 7 => lang('Display and modification of content'),
5 => lang('Display of content'), 5 => lang('Display of content'),
@ -1100,7 +1100,7 @@ class filemanager_ui
); );
if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false) // backend supports eacl if(($content['eacl'] = egw_vfs::get_eacl($content['path'])) !== false) // backend supports eacl
{ {
unset($readonlys['tabs']['eacl']); // --> switch the tab on again unset($readonlys['tabs']['filemanager.file.eacl']); // --> switch the tab on again
foreach($content['eacl'] as &$eacl) foreach($content['eacl'] as &$eacl)
{ {
$eacl['path'] = parse_url($eacl['path'],PHP_URL_PATH); $eacl['path'] = parse_url($eacl['path'],PHP_URL_PATH);

2
filemanager/templates/default/file.xet
View File

@ -163,7 +163,7 @@
</row> </row>
<row valign="bottom" disabled="!@is_owner"> <row valign="bottom" disabled="!@is_owner">
<menulist class="filemanager-file_filemanager-file-eaclowner eaclAccount"> <menulist class="filemanager-file_filemanager-file-eaclowner eaclAccount">
<menupopup type="select-account" class="eaclAccount" label="Owner" id="eacl[owner]" options="select one,both"/> <menupopup type="select-account" class="eaclAccount" label="Owner" id="eacl_owner" options="select one,both"/>
</menulist> </menulist>
<menulist> <menulist>
<menupopup class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"/> <menupopup class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"/>