Author: david
Date: Tue Sep 15 15:23:44 2009
New Revision: 3320
Log:
Fix display of existing groups for aclUser/edit.
Modified:
trunk/apps/qubit/modules/user/actions/editAction.class.php
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 Tue Sep 15
13:57:03 2009 (r3319)
+++ trunk/apps/qubit/modules/user/actions/editAction.class.php Tue Sep 15
15:23:44 2009 (r3320)
@@ -46,20 +46,25 @@
$this->form->setWidget($name, new sfWidgetFormInputPassword);
break;
case 'groups':
+ $values = array();
$criteria = new Criteria;
- $this->user->addaclUserGroupsCriteria($criteria);
+ $criteria->add(QubitAclUserGroup::USER_ID, $this->user->id,
Criteria::EQUAL);
+ foreach (QubitAclUserGroup::get($criteria) as $userGroup)
+ {
+ $values[] = $userGroup->groupId;
+ }
- $values = array();
$choices = array();
- foreach ($this->userGroups = QubitAclUserGroup::get($criteria) as
$userGroup)
+ $criteria = new Criteria;
+ $criteria->add(QubitAclGroup::ID, QubitAclGroup::ROOT_ID,
Criteria::NOT_EQUAL);
+ foreach (QubitAclGroup::get($criteria) as $group)
{
- $values[] = $this->context->routing->generate(null, array('module'
=> 'aclGroup', 'action' => 'show', 'id' => $userGroup->groupId));
- $choices[$this->context->routing->generate(null, array('module' =>
'aclGroup', 'action' => 'show', 'id' => $userGroup->groupId))] =
$userGroup->group->name;
+ $choices[$group->id] = $group->name;
}
- $this->form->setDefault('groups', $values);
- $this->form->setValidator('groups', new sfValidatorPass);
- $this->form->setWidget('groups', new
sfWidgetFormSelect(array('choices' => $choices, 'multiple' => true)));
+ $this->form->setDefault($name, $values);
+ $this->form->setValidator($name, new sfValidatorPass);
+ $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices, 'multiple' => true)));
break;
}
Modified: trunk/apps/qubit/modules/user/templates/editSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/editSuccess.php Tue Sep 15
13:57:03 2009 (r3319)
+++ trunk/apps/qubit/modules/user/templates/editSuccess.php Tue Sep 15
15:23:44 2009 (r3320)
@@ -41,13 +41,7 @@
<fieldset class="collapsible collapsed" id="groupsAndPermissions">
<legend><?php echo __('groups and permissions')?></legend>
- <div class="form-item">
- <div style="width: 98%">
- <?php echo $form->groups->label(__('groups'))->renderLabel() ?>
- <?php echo $form->groups->render(array('class' => 'form-autocomplete'))
?>
- <input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'aclGroup', 'action' => 'list')) ?>"/>
- </div>
- </div>
+ <?php echo $form->groups->renderRow(array('class' => 'form-autocomplete')) ?>
<table class="inline">
<caption><?php echo __('Existing permissions'); ?></caption>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
