Author: peter
Date: Tue Sep 22 15:25:45 2009
New Revision: 3470
Log:
remove repository <--> actor context menu links. beta-testers found the concept
too abstract. Apply repository re-direct to Actor->Edit->Cancel to mirror
'Save' behaviour is user was rerouted to the Actor edit screen from the
Repository module
Modified:
trunk/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
trunk/apps/qubit/modules/actor/templates/_contextMenu.php
trunk/apps/qubit/modules/actor/templates/editIsaarSuccess.php
trunk/apps/qubit/modules/repository/templates/_contextMenu.php
Modified: trunk/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
Tue Sep 22 14:53:30 2009 (r3469)
+++ trunk/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
Tue Sep 22 15:25:45 2009 (r3470)
@@ -34,8 +34,6 @@
{
$this->actor = QubitActor::getById($request->getParameter('id'));
- $this->repository =
QubitRepository::getById($request->getParameter('id'));
-
if (null !== $this->actor)
{
$this->informationObjectRelations =
$this->actor->getInformationObjectRelations();
@@ -51,7 +49,6 @@
else
{
$this->relatedInfoObjects = null;
- $this->repository = null;
}
// Don't show anything if there are no related info objects or repository
@@ -60,4 +57,4 @@
return sfView::NONE;
}
}
-}
\ No newline at end of file
+}
Modified: trunk/apps/qubit/modules/actor/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/_contextMenu.php Tue Sep 22
14:53:30 2009 (r3469)
+++ trunk/apps/qubit/modules/actor/templates/_contextMenu.php Tue Sep 22
15:25:45 2009 (r3470)
@@ -1,11 +1,5 @@
<div class="context-column-box">
<div class="contextMenu">
- <?php if ($repository): ?>
- <div class="label">
- <?php echo __('%1% information', array('%1%' =>
sfConfig::get('app_ui_label_repository'))) ?>
- </div>
- <?php echo link_to(render_title($repository),
'repository/show?id='.$repository->getId()) ?>
- <?php endif; ?>
<?php if ($relatedInfoObjects): ?>
<?php foreach ($relatedInfoObjects as $role => $relations): ?>
@@ -20,4 +14,4 @@
<?php endforeach; ?>
<?php endif; ?>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/apps/qubit/modules/actor/templates/editIsaarSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/editIsaarSuccess.php Tue Sep
22 14:53:30 2009 (r3469)
+++ trunk/apps/qubit/modules/actor/templates/editIsaarSuccess.php Tue Sep
22 15:25:45 2009 (r3470)
@@ -439,7 +439,11 @@
<ul class="actions">
<?php if (isset($sf_request->id)): ?>
- <li><?php echo link_to(__('Cancel'), array('module' => 'actor', 'action'
=> 'show', 'id' => $actor->id)) ?></li>
+ <?php if($repositoryReroute): ?>
+ <li><?php echo link_to(__('Cancel'), array('module' => 'repository',
'action' => 'show', 'id' => $repositoryReroute)) ?>
+ <?php else: ?>
+ <li><?php echo link_to(__('Cancel'), array('module' => 'actor',
'action' => 'show', 'id' => $actor->id)) ?></li>
+ <?php endif; ?>
<li><?php echo submit_tag(__('Save')) ?></li>
<?php else: ?>
<li><?php echo link_to(__('Cancel'), array('module' => 'actor', 'action'
=> 'list')) ?></li>
Modified: trunk/apps/qubit/modules/repository/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_contextMenu.php Tue Sep
22 14:53:30 2009 (r3469)
+++ trunk/apps/qubit/modules/repository/templates/_contextMenu.php Tue Sep
22 15:25:45 2009 (r3470)
@@ -1,9 +1,5 @@
<div class="context-column-box">
<div class="contextMenu">
- <div class="label">
- <?php echo __('%1% information', array('%1%' =>
sfConfig::get('app_ui_label_actor'))) ?>
- </div>
- <?php echo
link_to(render_title($repository->getAuthorizedFormOfName(array('cultureFallback'
=> true))), 'actor/show?id='.$repository->getId()) ?>
<!-- Only display holdings on "show" templates to avoid form submit issues
with using pager -->
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
