Author: jablko
Date: Thu Oct 14 17:42:19 2010
New Revision: 8151
Log:
s/$repository/$resource
Modified:
trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/repository/actions/browseAction.class.php
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
trunk/apps/qubit/modules/repository/templates/_contextMenu.php
trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
trunk/apps/qubit/modules/repository/templates/browseSuccess.php
trunk/apps/qubit/modules/repository/templates/deleteSuccess.php
Modified:
trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
Thu Oct 14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
Thu Oct 14 17:42:19 2010 (r8151)
@@ -22,17 +22,16 @@
public function execute($request)
{
$criteria = new Criteria;
- $criteria->add(QubitObject::CLASS_NAME, 'QubitRepository');
- $criteria->addJoin(QubitActorI18n::ID, QubitActor::ID);
- $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
+ $criteria->addJoin(QubitActor::ID, QubitActorI18n::ID);
+ $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME,
"$request->query%", Criteria::LIKE);
$criteria->addAscendingOrderByColumn('authorized_form_of_name');
$criteria->setDistinct();
$criteria->setLimit(sfConfig::get('app_hits_per_page', 10));
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitActor');
- // Filter 'denied' repositories if list for repository auto-complete on
info
- // object form
+ // Filter "denied" repositories if list for repository autocomplete on
+ // information object form
if (isset($request->aclAction))
{
$repositoryList = array();
@@ -41,7 +40,6 @@
// If all repositories are denied, no response
if (1 == count($repositoryAccess) && QubitAcl::DENY ==
$repositoryAccess[0]['access'])
{
-
return sfView::NONE;
}
else
@@ -56,18 +54,18 @@
{
if (QubitAcl::DENY == $repo['access'])
{
- // Require repos to be specifically allowed (all others
prohibited)
+ // Require repositories to be specifically allowed (all others
+ // prohibited)
$criteria->add(QubitRepository::ID, $repositoryList +
array('null'), Criteria::IN);
}
else
{
- // Prohibit specified repos (all others allowed)
+ // Prohibit specified repositories (all others allowed)
$criteria->add(QubitRepository::ID, $repositoryList,
Criteria::NOT_IN);
}
}
}
}
-
}
$this->repositories = QubitRepository::get($criteria);
Modified: trunk/apps/qubit/modules/repository/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/browseAction.class.php Thu Oct
14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/actions/browseAction.class.php Thu Oct
14 17:42:19 2010 (r8151)
@@ -59,7 +59,6 @@
}
// Do source culture fallback
- $criteria->addJoin(QubitRepository::ID, QubitActor::ID);
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitActor');
// Page results
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Thu Oct 14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Thu Oct 14 17:42:19 2010 (r8151)
@@ -26,15 +26,15 @@
$request->limit = sfConfig::get('app_hits_per_page');
}
- $this->repository = QubitRepository::getById($request->id);
- if (null === $this->repository)
+ $this->resource = $this->getRoute()->resource;
+ if (!isset($this->resource))
{
return sfView::NONE;
}
$criteria = new Criteria;
$criteria->addJoin(QubitInformationObject::ID, QubitObject::ID,
Criteria::INNER_JOIN);
- $criteria->add(QubitInformationObject::REPOSITORY_ID,
$this->repository->id);
+ $criteria->add(QubitInformationObject::REPOSITORY_ID, $this->resource->id);
$criteria->addAscendingOrderByColumn('title');
// Sort holdings alphabetically (w/ fallback)
Modified: trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Thu Oct
14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Thu Oct
14 17:42:19 2010 (r8151)
@@ -23,28 +23,23 @@
{
$this->form = new sfForm;
- $this->repository = QubitRepository::getById($request->id);
-
- if (!isset($this->repository))
- {
- $this->forward404();
- }
+ $this->resource = $this->getRoute()->resource;
if ($request->isMethod('delete'))
{
- foreach ($this->repository->informationObjects as $informationObject)
+ foreach ($this->resource->informationObjects as $item)
{
- unset($informationObject->repository);
+ unset($item->repository);
- $informationObject->save();
+ $item->save();
}
- foreach (QubitRelation::getBySubjectOrObjectId($this->repository->id) as
$relation)
+ foreach (QubitRelation::getBySubjectOrObjectId($this->resource->id) as
$item)
{
- $relation->delete();
+ $item->delete();
}
- $this->repository->delete();
+ $this->resource->delete();
$this->redirect(array('module' => 'repository', 'action' => 'browse'));
}
Modified: trunk/apps/qubit/modules/repository/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_contextMenu.php Thu Oct
14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/templates/_contextMenu.php Thu Oct
14 17:42:19 2010 (r8151)
@@ -1,20 +1,24 @@
<div>
<h3><?php echo sfConfig::get('app_ui_label_holdings') ?></h3>
+
<div>
+
<div class="search">
- <form action="<?php echo url_for(array($repository, 'module' =>
'search')) ?>">
+ <form action="<?php echo url_for(array($resource, 'module' => 'search'))
?>">
<input type="text" name="query" value="<?php echo $sf_request->query
?>">
<input type="submit" value="search" class="form-submit" />
</form>
</div>
+
<ul>
<?php foreach ($holdings as $holding): ?>
<li><?php echo link_to(render_title($holding), array($holding,
'module' => 'informationobject')) ?><?php if
(QubitTerm::PUBLICATION_STATUS_DRAFT_ID ==
$holding->getPublicationStatus()->status->id): ?> <span
class="publicationStatus"><?php echo $holding->getPublicationStatus()->status
?></span><?php endif; ?></li>
<?php endforeach; ?>
</ul>
- </div>
- <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+ <?php echo get_partial('default/pager', array('pager' => $pager)) ?>
+
+ </div>
</div>
Modified: trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
Thu Oct 14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
Thu Oct 14 17:42:19 2010 (r8151)
@@ -1,15 +1,11 @@
<table>
-<caption><?php echo __('Repository list') ?></caption>
-<thead>
-<tr><th><?php echo __('Name') ?></th></tr>
-</thead>
-<tbody>
-<?php foreach($repositories as $repository): ?>
-<tr>
- <td>
- <?php echo
link_to($repository->getAuthorizedFormOfName(array('cultureFallback' => true)),
array($repository, 'module' => 'repository')) ?>
- </td>
-</tr>
-<?php endforeach; ?>
-</tbody>
+ <tbody>
+ <?php foreach($repositories as $item): ?>
+ <tr>
+ <td>
+ <?php echo
link_to($item->getAuthorizedFormOfName(array('cultureFallback' => true)),
array($item, 'module' => 'repository')) ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
</table>
Modified: trunk/apps/qubit/modules/repository/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/browseSuccess.php Thu Oct
14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/templates/browseSuccess.php Thu Oct
14 17:42:19 2010 (r8151)
@@ -2,7 +2,7 @@
<div class="section tabs">
- <h2 class="element-invisible"><?php echo __('Repository Browse Options')
?></h2>
+ <h2 class="element-invisible"><?php echo __('Repository browse options')
?></h2>
<div class="content">
<ul class="clearfix links">
Modified: trunk/apps/qubit/modules/repository/templates/deleteSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/deleteSuccess.php Thu Oct
14 17:27:14 2010 (r8150)
+++ trunk/apps/qubit/modules/repository/templates/deleteSuccess.php Thu Oct
14 17:42:19 2010 (r8151)
@@ -1,15 +1,18 @@
-<h1><?php echo __('Are you sure you want to delete %1%?', array('%1%' =>
render_title($repository))) ?></h1>
+<h1><?php echo __('Are you sure you want to delete %1%?', array('%1%' =>
render_title($resource))) ?></h1>
-<?php echo $form->renderFormTag(url_for(array($repository, 'module' =>
'repository', 'action' => 'delete')), array('method' => 'delete')) ?>
+<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
'repository', 'action' => 'delete')), array('method' => 'delete')) ?>
<div class="actions section">
+
<h2 class="element-invisible"><?php echo __('Actions') ?></h2>
+
<div class="content">
<ul class="clearfix links">
- <li><?php echo link_to(__('Cancel'), array($repository, 'module' =>
'repository')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'repository')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Confirm') ?>"/></li>
</ul>
</div>
+
</div>
</form>
--
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.
