Author: david
Date: Thu Sep 17 11:53:52 2009
New Revision: 3374
Log:
Enable multi-delete for user/edit.
Modified:
trunk/apps/qubit/modules/user/actions/editAction.class.php
trunk/apps/qubit/modules/user/config/view.yml
trunk/apps/qubit/modules/user/templates/editSuccess.php
Modified: trunk/apps/qubit/modules/user/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/editAction.class.php Thu Sep 17
11:33:40 2009 (r3373)
+++ trunk/apps/qubit/modules/user/actions/editAction.class.php Thu Sep 17
11:53:52 2009 (r3374)
@@ -97,7 +97,11 @@
// HACK: because $this->user->getAclPermissions() is erroneously calling
// QubitObject::getaclPermissionsById()
- $this->permissions = QubitUser::getaclPermissionsById($this->user->id,
array('self' => $this));
+ $this->permissions = null;
+ if (null != $this->user->id)
+ {
+ $this->permissions = QubitUser::getaclPermissionsById($this->user->id,
array('self' => $this));
+ }
$this->credentials = $this->user->getUserCredentials();
$this->isAdministrator = false;
@@ -176,6 +180,7 @@
$aclPermission = new QubitAclPermission;
$aclPermission->userId = $this->user->id;
$aclPermission->actionId = $formData['actionId'];
+ $aclPermission->objectId = QubitInformationObject::ROOT_ID;
}
else
{
Modified: trunk/apps/qubit/modules/user/config/view.yml
==============================================================================
--- trunk/apps/qubit/modules/user/config/view.yml Thu Sep 17 11:33:40
2009 (r3373)
+++ trunk/apps/qubit/modules/user/config/view.yml Thu Sep 17 11:53:52
2009 (r3374)
@@ -1,2 +1,2 @@
editSuccess:
- javascripts: [autocomplete, /sfDrupalPlugin/vendor/drupal/misc/collapse,
/sfDrupalPlugin/vendor/drupal/misc/textarea]
\ No newline at end of file
+ javascripts: [autocomplete, multiDelete,
/sfDrupalPlugin/vendor/drupal/misc/collapse,
/sfDrupalPlugin/vendor/drupal/misc/textarea]
\ No newline at end of file
Modified: trunk/apps/qubit/modules/user/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/editSuccess.php Thu Sep 17
11:33:40 2009 (r3373)
+++ trunk/apps/qubit/modules/user/templates/editSuccess.php Thu Sep 17
11:53:52 2009 (r3374)
@@ -53,7 +53,7 @@
<?php if (0 < count($permissions)): ?>
<table class="inline">
- <caption><?php echo __('Existing permissions'); ?></caption>
+ <caption><?php echo __('Existing permissions (archival descriptions)');
?></caption>
<thead>
<tr>
<th style="width: 20%"><?php echo __('action') ?></th>
@@ -93,7 +93,7 @@
<?php endif; ?>
<table class="inline">
- <caption><?php echo __('Add a new permission'); ?></caption>
+ <caption><?php echo __('Add a new permission (archival descriptions)');
?></caption>
<thead>
<tr>
<th style="width: 20%"><?php echo __('action') ?></th>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
