From 04017a728b2223df7ced0aced4cbb3ae79e29ba1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 13 Nov 2012 12:07:10 +0000 Subject: [PATCH] * InfoLog: switching to a group-type resets access to "public" and disables access in edit --- infolog/inc/class.infolog_bo.inc.php | 1 + infolog/inc/class.infolog_ui.inc.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 35ea7588eb..de7334ee4c 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -851,6 +851,7 @@ class infolog_bo return false; // no edit rights from the group-owner and no implicit rights (delegated and sufficient rights) } } + $values['info_access'] = 'public'; // group-owners are allways public } elseif (!$values['info_id'] && !$values['info_owner'] || $GLOBALS['egw']->accounts->get_type($values['info_owner']) == 'g') { diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index ddb00453fb..d698787d41 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -1323,7 +1323,9 @@ else $entry['info_type'] = $settings; try { $this->bo->write($entry, true,true,true,$skip_notifications,true); // Throw exceptions - } catch (egw_exception_wrong_userinput $e) { + } + catch (egw_exception_wrong_userinput $e) + { $msg .= "\n".$e->getMessage(); $failed++; break; @@ -1946,6 +1948,8 @@ else //echo "

setting type to r/o as user has no delete rights from group #$group

\n"; $readonlys['info_type'] = true; } + // disable info_access for group-owners + $readonlys['info_access'] = true; } elseif($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g') {