Author: sevein
Date: Tue Jul 12 10:27:09 2011
New Revision: 9293
Log:
qtAccessionPlugin, browse and list actions
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/actions/browseAction.class.php
trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
trunk/plugins/qtAccessionPlugin/modules/donor/templates/browseSuccess.php
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/actions/browseAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/donor/actions/browseAction.class.php
Tue Jul 12 10:24:47 2011 (r9292)
+++
trunk/plugins/qtAccessionPlugin/modules/donor/actions/browseAction.class.php
Tue Jul 12 10:27:09 2011 (r9293)
@@ -21,6 +21,11 @@
{
public function execute($request)
{
+ if (!$this->context->user->hasCredential(array('contributor', 'editor',
'administrator'), false))
+ {
+ QubitAcl::forwardUnauthorized();
+ }
+
if (!isset($request->limit))
{
$request->limit = sfConfig::get('app_hits_per_page');
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
Tue Jul 12 10:24:47 2011 (r9292)
+++ trunk/plugins/qtAccessionPlugin/modules/donor/actions/listAction.class.php
Tue Jul 12 10:27:09 2011 (r9293)
@@ -21,6 +21,11 @@
{
public function execute($request)
{
+ if (!$this->context->user->hasCredential(array('contributor', 'editor',
'administrator'), false))
+ {
+ QubitAcl::forwardUnauthorized();
+ }
+
if (!isset($request->limit))
{
$request->limit = sfConfig::get('app_hits_per_page');
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/templates/browseSuccess.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/modules/donor/templates/browseSuccess.php
Tue Jul 12 10:24:47 2011 (r9292)
+++ trunk/plugins/qtAccessionPlugin/modules/donor/templates/browseSuccess.php
Tue Jul 12 10:27:09 2011 (r9293)
@@ -2,7 +2,7 @@
<div class="section tabs">
- <h2 class="element-invisible"><?php echo __('Donor browse options') ?></h2>
+ <h2 class="element-invisible"><?php echo __('Accession browse options')
?></h2>
<div class="content">
<ul class="clearfix links">
@@ -13,7 +13,7 @@
</div>
-<h1><?php echo __('Browse donor') ?></h1>
+<h1><?php echo __('Browse accession') ?></h1>
<table class="sticky-enabled">
<thead>
@@ -41,7 +41,7 @@
<?php foreach ($pager->getResults() as $item): ?>
<tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
<td>
- <?php echo link_to(render_title($item), array($item, 'module' =>
'donor')) ?>
+ <?php echo link_to(render_title($item), array($item, 'module' =>
'accession')) ?>
</td>
<?php if (!in_array($sf_request->sort, array('nameDown', 'nameUp'))):
?>
<td>
@@ -56,8 +56,8 @@
<?php echo get_partial('default/pager', array('pager' => $pager)) ?>
<div class="search">
- <form action="<?php echo url_for(array('module' => 'donor', 'action' =>
'list')) ?>">
+ <form action="<?php echo url_for(array('module' => 'accession', 'action' =>
'list')) ?>">
<input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>"/>
- <input class="form-submit" type="submit" value="<?php echo __('Search
donor') ?>"/>
+ <input class="form-submit" type="submit" value="<?php echo __('Search
accession') ?>"/>
</form>
</div>
Modified:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Tue Jul 12 10:24:47 2011 (r9292)
+++
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Tue Jul 12 10:27:09 2011 (r9293)
@@ -1,25 +1,44 @@
<h1><?php echo __('List accession records') ?></h1>
-<table class="sticky-enabled">
- <thead>
- <tr>
- <th>
- <?php echo __('Identifier') ?>
- </th><th>
- <?php echo __('Date') ?>
- </th>
- </tr>
- </thead><tbody>
- <?php foreach ($accessions as $item): ?>
- <tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
- <td>
- <?php echo link_to(render_title($item), array($item, 'module' =>
'accession')) ?>
- </td><td>
- <?php echo $item->date ?>
- </td>
+<?php if (isset($error)): ?>
+
+ <div class="search-results">
+ <ul>
+ <li><?php echo $error ?></li>
+ </ul>
+ </div>
+
+<?php else: ?>
+
+ <table class="sticky-enabled">
+ <thead>
+ <tr>
+ <th>
+ <?php echo __('Identifier') ?>
+ </th><th>
+ <?php echo __('Date') ?>
+ </th>
</tr>
- <?php endforeach; ?>
- </tbody>
-</table>
+ </thead><tbody>
+ <?php foreach ($accessions as $item): ?>
+ <tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
+ <td>
+ <?php echo link_to(render_title($item), array($item, 'module' =>
'accession')) ?>
+ </td><td>
+ <?php echo $item->date ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+
+<?php endif; ?>
-<?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+<div class="search">
+ <form action="<?php echo url_for(array('module' => 'accession', 'action' =>
'list')) ?>">
+ <input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>"/>
+ <input class="form-submit" type="submit" value="<?php echo __('Search
accession') ?>"/>
+ </form>
+</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.com/group/qubit-commits?hl=en.
