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

Calendar: Category ACL fixes

Browse Source 
- Stop using iframe
- Columns get more width, spreading across the whole page
- Remove "both" option
This commit is contained in:
nathan 2023-01-12 15:20:13 -07:00
parent 8195adfa85
commit 4e875c049f
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_hooks.inc.php
View File

@ -120,12 +120,12 @@ class calendar_hooks
*/
static function admin()
{
$file = Array(
'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
'Category ACL' => Egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'),
'Update timezones' => Egw::link('/index.php','menuaction=calendar.calendar_timezones.update'),
$file = array(
'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
'Custom fields' => Egw::link('/index.php', 'menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
'Global Categories' => Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
'Category ACL' => Egw::link('/index.php', 'menuaction=calendar.calendar_uiforms.cat_acl&appname=calendar&ajax=true'),
'Update timezones' => Egw::link('/index.php', 'menuaction=calendar.calendar_timezones.update'),
);
display_section('calendar','calendar',$file);
}

34
calendar/templates/default/cat_acl.xet
View File

@ -6,23 +6,25 @@
<caption label="Category ACL"/>
<et2-description value="Category ACL only restrict adding a category to an event or changing status of a participant. It does NOT change the visibility of an event!"></et2-description>
</groupbox>
<grid>
<columns>
<column/>
<column/>
<column/>
</columns>
<rows>
<row class="th">
<et2-description value="Category"></et2-description>
<et2-description value="Restrict add category to"></et2-description>
<et2-description value="Restrict set status to"></et2-description>
</row>
<row class="row" valign="top">
<et2-select-cat id="${row}[cat_id]" emptyLabel="Select one"></et2-select-cat>
<et2-select-account rows="5" id="${row}[add]" multiple="1" placeholder="both"></et2-select-account>
<et2-select-account rows="5" id="${row}[status]" multiple="1" placeholder="both"></et2-select-account>
<grid width="100%">
<columns>
<column/>
<column/>
<column/>
</columns>
<rows>
<row class="th">
<et2-description value="Category"></et2-description>
<et2-description value="Restrict add category to"></et2-description>
<et2-description value="Restrict set status to"></et2-description>
</row>
<row class="row" valign="top">
<et2-select-cat id="${row}[cat_id]" emptyLabel="Select one"></et2-select-cat>
<et2-select-account rows="5" id="${row}[add]" multiple="1" emptyLabel="Select user or group"
accountType="both"></et2-select-account>
<et2-select-account rows="5" id="${row}[status]" multiple="1" emptyLabel="Select user or group"
accountType="both"></et2-select-account>
</row>
</rows>
</grid>
<et2-hbox>