Author: sevein
Date: Tue Jul 12 11:15:24 2011
New Revision: 9297
Log:
Separate qtAccesionPlugin accession/deaccession actions into different modules,
cleaner routes
Added:
trunk/plugins/qtAccessionPlugin/modules/accession/
- copied from r9287,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/
trunk/plugins/qtAccessionPlugin/modules/accession/actions/browseAction.class.php
- copied, changed from r9291,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/browseAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/templates/browseSuccess.php
- copied, changed from r9291,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/browseSuccess.php
trunk/plugins/qtAccessionPlugin/modules/deaccession/
trunk/plugins/qtAccessionPlugin/modules/deaccession/actions/
trunk/plugins/qtAccessionPlugin/modules/deaccession/templates/
Replaced:
trunk/plugins/qtAccessionPlugin/modules/accession/templates/listSuccess.php
- copied unchanged from r9294,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php
Deleted:
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/addInformationObjectAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexDeaccessionAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/listAction.class.php
trunk/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorComponent.class.php
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/addInformationObjectAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/addInformationObjectAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/addInformationObjectAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginAddInformationObjectAction extends sfAction
+class AccessionAddInformationObjectAction extends sfAction
{
public function execute($request)
{
Copied and modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/browseAction.class.php
(from r9291,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/browseAction.class.php)
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/browseAction.class.php
Tue Jul 12 10:16:42 2011 (r9291, copy source)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/browseAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginBrowseAction extends sfAction
+class AccessionBrowseAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginDeleteAction extends sfAction
+class AccessionDeleteAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/deleteDeaccessionAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/deleteDeaccessionAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginDeleteDeaccessionAction extends sfAction
+class AccessionDeleteDeaccessionAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginEditAction extends DefaultEditAction
+class AccessionEditAction extends DefaultEditAction
{
// Arrays not allowed in class constants
public static
@@ -76,7 +76,7 @@
$this->response->setTitle("$title - {$this->response->getTitle()}");
- $this->relatedDonorComponent = new
qtAccessionPluginRelatedDonorComponent($this->context, 'qtAccessionPlugin',
'relatedDonor');
+ $this->relatedDonorComponent = new
AccessionRelatedDonorComponent($this->context, 'accession', 'relatedDonor');
$this->relatedDonorComponent->resource = $this->resource;
$this->relatedDonorComponent->execute($this->request);
}
@@ -277,7 +277,7 @@
$this->resource->save();
- $this->redirect(array($this->resource, 'module' =>
'qtAccessionPlugin', 'action' => 'index'));
+ $this->redirect(array($this->resource, 'module' => 'accession'));
}
}
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editDeaccessionAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/editDeaccessionAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginEditDeaccessionAction extends DefaultEditAction
+class AccessionEditDeaccessionAction extends DefaultEditAction
{
// Arrays not allowed in class constants
public static
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginIndexAction extends sfAction
+class AccessionIndexAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexDeaccessionAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/indexDeaccessionAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/indexDeaccessionAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginIndexDeaccessionAction extends sfAction
+class AccessionIndexDeaccessionAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/listAction.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/listAction.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/listAction.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginListAction extends sfAction
+class AccessionListAction extends sfAction
{
public function execute($request)
{
Modified:
trunk/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorComponent.class.php
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/relatedDonorComponent.class.php
Mon Jul 11 23:50:23 2011 (r9287)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorComponent.class.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -17,7 +17,7 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class qtAccessionPluginRelatedDonorComponent extends RelationEditComponent
+class AccessionRelatedDonorComponent extends RelationEditComponent
{
// Arrays not allowed in class constants
public static
Copied and modified:
trunk/plugins/qtAccessionPlugin/modules/accession/templates/browseSuccess.php
(from r9291,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/browseSuccess.php)
==============================================================================
---
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/browseSuccess.php
Tue Jul 12 10:16:42 2011 (r9291, copy source)
+++
trunk/plugins/qtAccessionPlugin/modules/accession/templates/browseSuccess.php
Tue Jul 12 11:15:24 2011 (r9297)
@@ -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>
Copied:
trunk/plugins/qtAccessionPlugin/modules/accession/templates/listSuccess.php
(from r9294,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtAccessionPlugin/modules/accession/templates/listSuccess.php
Tue Jul 12 11:15:24 2011 (r9297, copy of r9294,
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/listSuccess.php)
@@ -0,0 +1,44 @@
+<h1><?php echo __('List accession record') ?></h1>
+
+<?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>
+ </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; ?>
+
+<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.
