Author: peter
Date: 2008-12-15 16:13:18 -0800 (Mon, 15 Dec 2008)
New Revision: 1688
Modified:
trunk/qubit/apps/qubit/modules/actor/config/security.yml
trunk/qubit/apps/qubit/modules/i18n/actions/listUserInterfaceTranslationAction.class.php
trunk/qubit/apps/qubit/modules/i18n/templates/listUserInterfaceTranslationSuccess.php
Log:
enhance the 'Translate -> User Interface' list to allow it work more
generically: (1) it will now work with whatever data is present in the system
instead of looking for specific records (2) if the appropriate data is not
present it simply won't add a link to that form (instead of crashing as before)
Modified: trunk/qubit/apps/qubit/modules/actor/config/security.yml
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/config/security.yml 2008-12-15
23:42:57 UTC (rev 1687)
+++ trunk/qubit/apps/qubit/modules/actor/config/security.yml 2008-12-16
00:13:18 UTC (rev 1688)
@@ -4,7 +4,7 @@
createIsaar:
is_secure: on
- credentials: [[ contributor, editor, administrator ]]
+ credentials: [[ contributor, editor, administrator, translator ]]
delete:
is_secure: on
Modified:
trunk/qubit/apps/qubit/modules/i18n/actions/listUserInterfaceTranslationAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/i18n/actions/listUserInterfaceTranslationAction.class.php
2008-12-15 23:42:57 UTC (rev 1687)
+++
trunk/qubit/apps/qubit/modules/i18n/actions/listUserInterfaceTranslationAction.class.php
2008-12-16 00:13:18 UTC (rev 1688)
@@ -24,35 +24,34 @@
public function execute($request)
{
$criteria = new Criteria;
- $criteria->add(QubitInformationObjectI18n::TITLE, 'Townley, Matheson and
Partners fonds');
- $this->sampleInformationObject =
QubitInformationObjectI18n::getOne($criteria);
+ $criteria->add(QubitInformationObject::PARENT_ID, null,
Criteria::ISNOTNULL);
+ $this->sampleInformationObject = QubitInformationObject::getOne($criteria);
$criteria = new Criteria;
- $criteria->addJoin(QubitPhysicalObject::ID, QubitPhysicalObjectI18n::ID);
- $criteria->add(QubitPhysicalObjectI18n::NAME, 'Box A12');
$this->samplePhysicalObject = QubitPhysicalObject::getOne($criteria);
$criteria = new Criteria;
- $criteria->add(QubitDigitalObject::NAME, 'A37992.jpg');
$this->sampleDigitalObject = QubitDigitalObject::getOne($criteria);
$criteria = new Criteria;
- $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, 'Townley, Matheson
and Partners');
- $this->sampleActor = QubitActorI18n::getOne($criteria);
+ $criteria->addJoin(QubitActor::ID, QubitActorI18n::ID);
+ $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, '',
Criteria::NOT_EQUAL);
+ $this->sampleActor = QubitActor::getOne($criteria);
$criteria = new Criteria;
- $criteria->addJoin(QubitRepository::ID, QubitActor::ID);
- $criteria->addJoin(QubitActor::ID, QubitActorI18n::ID);
- $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, 'City of Vancouver
Archives');
$this->sampleRepository = QubitRepository::getOne($criteria);
+ if (null === ($this->sampleContactInformation =
$this->sampleRepository->getPrimaryContact()))
+ {
+ $criteria = new Criteria;
+ $this->sampleContactInformation =
QubitContactInformation::getOne($criteria);
+ }
+
$criteria = new Criteria;
- $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
- $criteria->add(QubitTermI18n::NAME, 'Series');
+ $criteria->add(QubitTerm::TAXONOMY_ID,
QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID);
$this->sampleTerm = QubitTerm::getOne($criteria);
$criteria = new Criteria;
- $criteria->add(QubitStaticPage::PERMALINK, 'homepage');
$this->sampleStaticPage = QubitStaticPage::getOne($criteria);
}
}
\ No newline at end of file
Modified:
trunk/qubit/apps/qubit/modules/i18n/templates/listUserInterfaceTranslationSuccess.php
===================================================================
---
trunk/qubit/apps/qubit/modules/i18n/templates/listUserInterfaceTranslationSuccess.php
2008-12-15 23:42:57 UTC (rev 1687)
+++
trunk/qubit/apps/qubit/modules/i18n/templates/listUserInterfaceTranslationSuccess.php
2008-12-16 00:13:18 UTC (rev 1688)
@@ -7,59 +7,75 @@
<ul>
<li><?php echo link_to(__('create (ISAD)'),
'informationobject/createIsad') ?></li>
<li><?php echo link_to(__('create (RAD)'), 'informationobject/createRad')
?></li>
- <li><?php echo link_to(__('edit (ISAD)'),
'informationobject/editIsad?id='.$sampleInformationObject->getId()) ?></li>
- <li><?php echo link_to(__('edit (RAD)'),
'informationobject/editRad?id='.$sampleInformationObject->getId()) ?></li>
- <li><?php echo link_to(__('edit (Dublin Core)'),
'informationobject/editDc?id='.$sampleInformationObject->getId()) ?></li>
- <li><?php echo link_to(__('list'), 'informationobject/list') ?></li>
- <li><?php echo link_to(__('view (ISAD)'),
'informationobject/showIsad?id='.$sampleInformationObject->getId()) ?></li>
- <li><?php echo link_to(__('view (RAD)'),
'informationobject/showRad?id='.$sampleInformationObject->getId()) ?></li>
- <li><?php echo link_to(__('view digital object'),
'digitalobject/show?id='.$sampleDigitalObject->getId()) ?></li>
- <li><?php echo link_to(__('view digital object master'),
'digitalobject/showFullScreen?id='.$sampleDigitalObject->getId()) ?></li>
- <li><?php echo link_to(__('edit physical storage'),
'physicalobject/edit?id='.$samplePhysicalObject->getId()) ?></li>
+ <?php if ($sampleInformationObject): ?>
+ <li><?php echo link_to(__('edit (ISAD)'),
'informationobject/editIsad?id='.$sampleInformationObject->getId()) ?></li>
+ <li><?php echo link_to(__('edit (RAD)'),
'informationobject/editRad?id='.$sampleInformationObject->getId()) ?></li>
+ <li><?php echo link_to(__('edit (Dublin Core)'),
'informationobject/editDc?id='.$sampleInformationObject->getId()) ?></li>
+ <li><?php echo link_to(__('list'), 'informationobject/list') ?></li>
+ <li><?php echo link_to(__('view (ISAD)'),
'informationobject/showIsad?id='.$sampleInformationObject->getId()) ?></li>
+ <li><?php echo link_to(__('view (RAD)'),
'informationobject/showRad?id='.$sampleInformationObject->getId()) ?></li>
+ <?php endif; ?>
+ <?php if ($sampleDigitalObject): ?>
+ <li><?php echo link_to(__('view digital object'),
'digitalobject/show?id='.$sampleDigitalObject->getId()) ?></li>
+ <li><?php echo link_to(__('view digital object master'),
'digitalobject/showFullScreen?id='.$sampleDigitalObject->getId()) ?></li>
+ <?php endif; ?>
+ <?php if ($samplePhysicalObject): ?>
+ <li><?php echo link_to(__('edit physical storage'),
'physicalobject/edit?id='.$samplePhysicalObject->getId()) ?></li>
+ <?php endif; ?>
</ul>
<div class="tableHeader" style="margin-bottom: 10px;"><?php echo __('%1%
module', array('%1%' => sfConfig::get('app_ui_label_actor')))?></div>
<ul>
<li><?php echo link_to(__('create (ISAAR)'), 'actor/createIsaar') ?></li>
- <li><?php echo link_to(__('edit (ISAAR)'),
'actor/editIsaar?id='.$sampleActor->getId()) ?></li>
- <li><?php echo link_to(__('list'), 'actor/list') ?></li>
- <li><?php echo link_to(__('view (ISAAR)'),
'actor/showIsaar?id='.$sampleActor->getId()) ?></li>
+ <?php if ($sampleActor): ?>
+ <li><?php echo link_to(__('edit (ISAAR)'),
'actor/editIsaar?id='.$sampleActor->getId()) ?></li>
+ <li><?php echo link_to(__('view (ISAAR)'),
'actor/showIsaar?id='.$sampleActor->getId()) ?></li>
+ <?php endif; ?>
+ <li><?php echo link_to(__('list'), 'actor/list') ?></li>
</ul>
<div class="tableHeader" style="margin-bottom: 10px;"><?php echo __('%1%
module', array('%1%' => sfConfig::get('app_ui_label_repository')))?></div>
<ul>
<li><?php echo link_to(__('create (ISDIAH)'), 'repository/createIsdiah')
?></li>
- <li><?php echo link_to(__('edit (ISDIAH)'),
'repository/editIsdiah?id='.$sampleRepository->getId()) ?></li>
- <li><?php echo link_to(__('edit contact information'),
'actor/editContactInformation?id='.$sampleRepository->getPrimaryContact()->getId())
?></li>
+ <?php if ($sampleRepository): ?>
+ <li><?php echo link_to(__('edit (ISDIAH)'),
'repository/editIsdiah?id='.$sampleRepository->getId()) ?></li>
+ <?php if ($sampleContactInformation): ?>
+ <li><?php echo link_to(__('edit contact information'), array('module'
=> 'actor', 'action' => 'editContactInformation', 'id' =>
$sampleContactInformation->getId())) ?></li>
+ <?php endif; ?>
+ <li><?php echo link_to(__('view (ISDIAH)'),
'repository/show?id='.$sampleRepository->getId()) ?></li>
+ <?php endif; ?>
<li><?php echo link_to(__('list'), 'repository/list') ?></li>
- <li><?php echo link_to(__('view (ISDIAH)'),
'repository/show?id='.$sampleRepository->getId()) ?></li>
</ul>
<div class="tableHeader" style="margin-bottom: 10px;"><?php echo __('term
module')?></div>
<ul>
<li><?php echo link_to(__('list'), 'term/list') ?></li>
- <li><?php echo link_to(__('edit'),
'term/edit?id='.$sampleTerm->getId().'&taxonomyId=0') ?></li>
+ <?php if ($sampleTerm): ?>
+ <li><?php echo link_to(__('edit'), 'term/edit?id='.$sampleTerm->getId())
?></li>
+ <?php endif; ?>
</ul>
<div class="tableHeader" style="margin-bottom: 10px;"><?php echo
__('search')?></div>
<ul>
- <li><?php echo link_to(__('search results'),
'search/keyword?search_query=foo') ?></li>
+ <li><?php echo link_to(__('search results'), 'search/keyword?query=a~')
?></li>
</ul>
<div class="tableHeader" style="margin-bottom: 10px;"><?php echo __('admin
module')?></div>
<ul>
<li><?php echo __('users')?></li>
- <ul>
+ <ul>
<li><?php echo link_to(__('login'), array('module' => 'user', 'action'
=> 'login')) ?></li>
- <li><?php echo link_to(__('view user profile'),
'user/show?id='.$sf_user->getUserID()) ?></li>
- <li><?php echo link_to(__('edit user profile'),
'user/edit?id='.$sf_user->getUserID()) ?></li>
- <li><?php echo link_to(__('reset password'),
'user/passwordEdit?id='.$sf_user->getUserID()) ?><?php echo __(' (warning: this
form is active, click \'cancel\' after translating)') ?></li>
- </ul>
+ <li><?php echo link_to(__('view user profile'), array('module' =>
'user', 'action' => 'show', 'id' => $sf_user->getUserID())) ?></li>
+ <li><?php echo link_to(__('edit user profile'), array('module' =>
'user', 'action' => 'edit', 'id' => $sf_user->getUserID())) ?></li>
+ <li><?php echo link_to(__('reset password'), array('module' => 'user',
'action' => 'passwordEdit', 'id' => $sf_user->getUserID())) ?> <?php echo __('
(warning: this form is active, click \'cancel\' after translating)') ?></li>
+ </ul>
<li><?php echo __('static pages')?></li>
- <ul>
- <li><?php echo link_to(__('list static page'), 'staticpage/list') ?></li>
- <li><?php echo link_to(__('edit static page'),
'staticpage/edit?id='.$sampleStaticPage->getId()) ?></li>
- <li><?php echo link_to(__('view static page'), '/homepage/') ?></li>
+ <ul>
+ <li><?php echo link_to(__('list static page'), array('module' =>
'staticpage', 'action' => 'list')) ?></li>
+ <?php if ($sampleStaticPage): ?>
+ <li><?php echo link_to(__('edit static page'), array('module' =>
'staticpage', 'action' => 'edit', 'id' => $sampleStaticPage->getId())) ?></li>
+ <?php endif; ?>
+ <li><?php echo link_to(__('view static page'), array('module' =>
'staticpage', 'action' => 'static', 'permalink' =>
$sampleStaticPage->getPermalink())) ?></li>
</ul>
<li><?php echo __('settings')?></li>
<ul>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
