Author: david
Date: Thu Sep 10 10:40:33 2009
New Revision: 3216
Log:
Add aclGroup module directory skeleton. Add aclGroup:list action and template.
Added:
trunk/plugins/qbAclPlugin/modules/
trunk/plugins/qbAclPlugin/modules/aclGroup/
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/listAction.class.php
(contents, props changed)
- copied, changed from r3215,
trunk/apps/qubit/modules/user/actions/listAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/config/
trunk/plugins/qbAclPlugin/modules/aclGroup/config/security.yml
trunk/plugins/qbAclPlugin/modules/aclGroup/config/view.yml
trunk/plugins/qbAclPlugin/modules/aclGroup/lib/
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/listSuccess.php
(contents, props changed)
- copied, changed from r3215,
trunk/apps/qubit/modules/user/templates/listSuccess.php
Copied and modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/listAction.class.php (from
r3215, trunk/apps/qubit/modules/user/actions/listAction.class.php)
==============================================================================
--- trunk/apps/qubit/modules/user/actions/listAction.class.php Thu Sep 10
00:08:52 2009 (r3215, copy source)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/actions/listAction.class.php
Thu Sep 10 10:40:33 2009 (r3216)
@@ -17,14 +17,23 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class UserListAction extends sfAction
+class aclGroupListAction extends sfAction
{
public function execute($request)
{
// Set current page
$this->page = $this->getRequestParameter('page', 1);
- $options['page'] = $this->page;
- $this->users = QubitUser::getList($options);
+ $c = new Criteria;
+ $c->addJoin(QubitAclGroup::ID, QubitAclGroupI18n::ID,
Criteria::INNER_JOIN);
+ $c->add(QubitAclGroupI18n::CULTURE, $this->getUser()->getCulture(),
Criteria::EQUAL);
+ $c->add(QubitAclGroup::ID, QubitAclGroup::ROOT_ID, Criteria::NOT_EQUAL);
+ $c->addAscendingOrderByColumn(QubitAclGroupI18n::NAME);
+
+ // Page results
+ $this->pager = new QubitPager('QubitAclGroup');
+ $this->pager->setCriteria($c);
+ $this->pager->setPage($this->page);
+ $this->pager->init();
}
}
Added: trunk/plugins/qbAclPlugin/modules/aclGroup/config/security.yml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/config/security.yml Thu Sep
10 10:40:33 2009 (r3216)
@@ -0,0 +1,2 @@
+all:
+ is_secure: on
Added: trunk/plugins/qbAclPlugin/modules/aclGroup/config/view.yml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/config/view.yml Thu Sep 10
10:40:33 2009 (r3216)
@@ -0,0 +1,3 @@
+all:
+ components:
+ sidebar: []
Copied and modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/listSuccess.php (from
r3215, trunk/apps/qubit/modules/user/templates/listSuccess.php)
==============================================================================
--- trunk/apps/qubit/modules/user/templates/listSuccess.php Thu Sep 10
00:08:52 2009 (r3215, copy source)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/templates/listSuccess.php
Thu Sep 10 10:40:33 2009 (r3216)
@@ -1,47 +1,54 @@
-<div class="pageTitle"><?php echo __('list users'); ?></div>
+<div class="pageTitle"><?php echo __('list groups'); ?></div>
<table class="list">
<thead>
<tr>
- <th><?php echo __('user name'); ?> <span class="th-link"><?php echo
link_to(__('add new'), 'user/create') ?></span></th>
- <th><?php echo __('email'); ?></th>
- <th><?php echo __('user roles'); ?></th>
+ <th>
+ <?php echo __('group name'); ?>
+ <span class="th-link"><?php echo link_to(__('add new'), array('module' =>
'aclGroup', 'action' => 'create')) ?></span>
+ </th>
+ <th><?php echo __('members'); ?></th>
</tr>
</thead>
<tbody>
-<?php foreach ($users->getResults() as $user): ?>
+<?php foreach ($pager->getResults() as $group): ?>
<tr>
- <td><?php echo link_to($user->getUsername(),
'user/edit?id='.$user->getId()) ?></td>
- <td><?php echo $user->getEmail() ?></td>
- <td><?php foreach ($user->getRoles() as $role): ?>
- <?php echo $role ?><br />
- <?php endforeach; ?>
- </td>
+ <td><?php echo link_to($group->getName(array('cultureFallback' => true)),
+ array('module' => 'aclGroup', 'action' => 'edit', 'id' => $group->id))
?></td>
+ <td><?php echo count($group->getAclUserGroups()) ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
-<?php if ($users->haveToPaginate()): ?>
+<?php if ($pager->haveToPaginate()): ?>
<div class="pager">
- <?php $links = $users->getLinks(); ?>
- <?php if ($users->getPage() != $users->getFirstPage()): ?>
- <?php echo link_to('< '.__('previous'),
'user/list?page='.($users->getPage()-1)) ?>
+ <?php $links = $pager->getLinks(); ?>
+ <?php if ($pager->getPage() != $pager->getFirstPage()): ?>
+ <?php echo link_to('< '.__('previous'), array('module' => 'aclGroup',
'action' => 'list', 'page' => $pager->getPage()-1)) ?>
<?php endif; ?>
<?php foreach ($links as $page): ?>
- <?php echo ($page == $users->getPage()) ? '<strong>'.$page.'</strong>' :
link_to($page, 'user/list?page='.$page) ?>
- <?php if ($page != $users->getCurrentMaxLink()): ?> <?php endif ?>
+ <?php if ($page == $pager->getPage()): ?>
+ <strong><?php echo $page ?></strong>
+ <?php else: ?>
+ <?php echo link_to($page, array('module' => 'aclGroup', 'action' =>
'list', 'page' => $page)) ?>
+ <?php endif; ?>
+ <?php if ($page != $pager->getCurrentMaxLink()): ?> <?php endif ?>
<?php endforeach ?>
- <?php if ($users->getPage() != $users->getLastPage()): ?>
- <?php echo link_to(__('next').' >', 'user/list?page='.($users->getPage()+1))
?>
+ <?php if ($pager->getPage() != $pager->getLastPage()): ?>
+ <?php echo link_to(__('next').' >', array('module' => 'aclGroup', 'action' =>
'list', 'page' => $pager->getPage()+1)) ?>
<?php endif; ?>
</div>
<?php endif ?>
<div class="result-count">
-<?php echo __('displaying %1% to %2% of %3% results', array('%1%' =>
$users->getFirstIndice(), '%2%' => $users->getLastIndice(), '%3%' =>
$users->getNbResults())) ?>
+<?php if (0 < $pager->getNbResults()): ?>
+ <?php echo __('displaying %1% to %2% of %3% results', array('%1%' =>
$pager->getFirstIndice(), '%2%' => $pager->getLastIndice(), '%3%' =>
$pager->getNbResults())) ?>
+<?php else: ?>
+ <?php echo __('no results found') ?>
+<?php endif; ?>
</div>
<div class="menu-action" style="padding-top: 10px;">
-<?php echo link_to (__('add new user'), 'user/create') ?>
+<?php echo link_to (__('add new group'), array('module' => 'aclGroup',
'action' => 'create')) ?>
</div>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
