Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[823] trunk/library
|
From: <gem...@li...> - 2012-07-06 16:35:22
|
Revision: 823
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=823&view=rev
Author: matijsdejong
Date: 2012-07-06 16:35:15 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
Final step in making Role editing user friendly
Modified Paths:
--------------
trunk/library/changelog.txt
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/configs/db/tables/gems__roles.20.sql
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/changelog.txt 2012-07-06 16:35:15 UTC (rev 823)
@@ -1,8 +1,10 @@
Important changes from 1.5.4 => 1.5.5
============================================================
+Role editing has become more interactive and safer to use
Internally code no longer uses the 'Hidden Organization' but expects both an id1/patientNr plus an id2/organizationId to be specified
Externally the organization id is still left out of the url when not needed
-UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
+UPGRADE WARNING: Check all your (snippet) extensions to RespondentAction, TrackAction, SurveyAction and project specific versions of ShowTrackTokenSnippet and ShowSingleSurveySnippet: you may need to specify extra parameters as the menu items need to know the organization id
+New projects start with a basic css template
Important changes from 1.5.3 => 1.5.4
============================================================
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2012-07-06 16:35:15 UTC (rev 823)
@@ -94,17 +94,23 @@
foreach ($possibleParents as $parent) {
if ($this->acl->hasRole($data['grl_name']) && $this->acl->inheritsRole($parent, $data['grl_name'])) {
$disabled[] = $parent;
+ $possibleParents[$parent] .= ' ' . MUtil_Html::create('small', $this->_('child of current role'), $this->view);
unset($currentParents[$parent]);
} else {
foreach ($currentParents as $p2) {
if ($this->acl->hasRole($p2) && $this->acl->inheritsRole($p2, $parent)) {
$disabled[] = $parent;
+ $possibleParents[$parent] .= ' ' . MUtil_Html::create(
+ 'small',
+ MUtil_Html::raw(sprintf($this->_('inherited from %s'), MUtil_Html::create('em', $p2, $this->view))),
+ $this->view);
$currentParents[$parent] = $parent;
}
}
}
}
$disabled[] = $data['grl_name'];
+ $possibleParents[$data['grl_name']] .= ' ' . MUtil_Html::create('small', $this->_('this role'), $this->view);
}
$bridge->addMultiCheckbox('grl_parents', 'multiOptions', $possibleParents,
'disable', $disabled,
Modified: trunk/library/configs/db/tables/gems__roles.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__roles.20.sql 2012-07-06 14:09:57 UTC (rev 822)
+++ trunk/library/configs/db/tables/gems__roles.20.sql 2012-07-06 16:35:15 UTC (rev 823)
@@ -31,6 +31,6 @@
('security','security','','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('staff','staff','pr.option.edit,pr.option.password,pr.plan,pr.plan.overview,pr.plan.token,pr.project,pr.project.questions,pr.respondent.create,pr.respondent.edit,pr.respondent.who,pr.setup,pr.staff,pr.survey,pr.survey.create,pr.token,pr.token.answers,pr.token.delete,pr.token.edit,pr.token.mail,pr.token.print,pr.track,pr.track.create,pr.track.delete,pr.track.edit,pr.respondent.reportdeath','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('physician','physician','','staff', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('researcher','researcher','pr.project-information.changelog,pr.contact,pr.export,pr.plan.token,pr.plan.respondent,pr.plan.overview,pr.option.password,pr.option.edit,pr.organization-switch,pr.islogin','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
+ ('researcher','researcher','pr.project-information.changelog,pr.contact,pr.export,pr.plan.token,pr.plan.respondent,pr.plan.overview,pr.option.password,pr.option.edit,pr.organization-switch,pr.islogin','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('admin','admin','pr.consent,pr.consent.create,pr.consent.edit,pr.group,pr.role,pr.mail,pr.mail.create,pr.mail.delete,pr.mail.edit,pr.mail.log,pr.organization,pr.organization-switch,pr.plan.overview.excel,pr.plan.respondent,pr.plan.respondent.excel,pr.plan.token.excel,pr.project-information,pr.reception,pr.reception.create,pr.reception.edit,pr.respondent.choose-org,pr.respondent.delete,pr.respondent.result,pr.source,pr.staff.create,pr.staff.delete,pr.staff.edit,pr.staff.see.all,pr.survey-maintenance,pr.track-maintenance,pr.token.mail.freetext','staff,researcher,security', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('super','super','pr.consent.delete,pr.country,pr.country.create,pr.country.delete,pr.country.edit,pr.database,pr.database.create,pr.database.delete,pr.database.edit,pr.database.execute,pr.database.patches,pr.group.create,pr.group.edit,pr.language,pr.mail.server,pr.mail.server.create,pr.mail.server.delete,pr.mail.server.edit,pr.organization.create,pr.organization.edit,pr.plan.choose-org,pr.plan.mail-as-application,pr.reception.delete,pr.role.create,pr.role.edit,pr.source.create,pr.source.edit,pr.source.synchronize,pr.source.synchronize-all,pr.staff.edit.all,pr.survey-maintenance.edit,pr.track-maintenance.create,pr.track-maintenance.edit,pr.maintenance','admin', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
