Author: jablko
Date: Sun Oct 17 19:09:31 2010
New Revision: 8216
Log:
Rename fields, for consistency
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordComponent.class.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordComponent.class.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -22,7 +22,7 @@
// Arrays not allowed in class constants
public static
$NAMES = array(
- 'object',
+ 'resource',
'description',
'startDate',
'endDate',
@@ -32,9 +32,9 @@
{
switch ($name)
{
- case 'object':
- $this->form->setValidator('object', new sfValidatorString);
- $this->form->setWidget('object', new sfWidgetFormInput);
+ case 'resource':
+ $this->form->setValidator('resource', new sfValidatorString);
+ $this->form->setWidget('resource', new sfWidgetFormInput);
break;
@@ -79,8 +79,8 @@
$relation = new QubitRelation;
}
- // Get related information object (object)
- $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['object']));
+ // Get related information object (resource)
+ $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['resource']));
$objectId = (isset($params['id'])) ? $params['id'] : null;
switch ($formName)
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -22,7 +22,7 @@
// Arrays not allowed in class constants
public static
$NAMES = array(
- 'authorizedFormOfName',
+ 'resource',
'type',
'description',
'startDate',
@@ -33,9 +33,9 @@
{
switch ($name)
{
- case 'authorizedFormOfName':
+ case 'resource':
$this->form->setValidator('authorisedFormOfName', new
sfValidatorString);
- $this->form->setWidget('authorizedFormOfName', new
sfWidgetFormSelect(array('choices' => array())));
+ $this->form->setWidget('resource', new
sfWidgetFormSelect(array('choices' => array())));
break;
@@ -102,7 +102,7 @@
foreach ($relationsData as $relationData)
{
// Get related function
- $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['authorizedFormOfName']));
+ $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['resource']));
$relatedFuncId = (isset($params['id'])) ? $params['id'] : null;
if (null === $relatedFunction = QubitFunction::getById($relatedFuncId))
{
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourceComponent.class.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -22,7 +22,7 @@
// Arrays not allowed in class constants
public static
$NAMES = array(
- 'object',
+ 'resource',
'description',
'startDate',
'endDate',
@@ -32,9 +32,9 @@
{
switch ($name)
{
- case 'object':
- $this->form->setValidator('object', new sfValidatorString);
- $this->form->setWidget('object', new
sfWidgetFormSelect(array('choices' => array())));
+ case 'resource':
+ $this->form->setValidator('resource', new sfValidatorString);
+ $this->form->setWidget('resource', new
sfWidgetFormSelect(array('choices' => array())));
break;
@@ -79,8 +79,8 @@
$relation = new QubitRelation;
}
- // Get related information object (object)
- $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['object']));
+ // Get related information object (resource)
+ $params =
$this->context->routing->parse(Qubit::pathInfo($relationData['resource']));
$objectId = (isset($params['id'])) ? $params['id'] : null;
switch ($formName)
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -43,7 +43,7 @@
// Template for new display table rows
$rowTemplate = '<tr id="{relatedEntity[id]}">'
.' <td>'
- ." {{$form->object->renderName()}}"
+ ." {{$form->resource->renderName()}}"
.' </td><td>'
." {{$form->description->renderName()}}"
.' </td><td>'
@@ -87,15 +87,15 @@
</caption><tbody>
<tr>
<th colspan="4">
- <?php echo $form->object
+ <?php echo $form->resource
->label(__('Authorized form of name'))
->renderLabel() ?>
</th>
</tr><tr>
<td colspan="4">
- <?php echo $form->object->render(array('class' =>
'form-autocomplete')) ?>
+ <?php echo $form->resource->render(array('class' =>
'form-autocomplete')) ?>
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'actor', 'action' => 'autocomplete', 'showOnlyActors'
=> 'true')) ?>"/>
- <?php echo $form->object
+ <?php echo $form->resource
->help(__('Select the name from the drop-down menu; enter the
identifier or the first few letters to narrow the choices. (ISDF 6.1)'))
->renderHelp() ?>
</td>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -54,7 +54,7 @@
$rowTemplate = '<tr id="{relation[id]}">'
.' <td>'
- ." {{$form->authorizedFormOfName->renderName()}}"
+ ." {{$form->resource->renderName()}}"
.' </td><td>'
." {{$form->type->renderName()}}"
.' </td><td>'
@@ -119,7 +119,7 @@
if ('$linkToShow' != data[col])
{
- output['relation[authorizedFormOfName]'] = data[col];
+ output['relation[resource]'] = data[col];
}
break;
@@ -163,15 +163,15 @@
</caption><tbody>
<tr>
<th colspan="4">
- <?php echo $form->authorizedFormOfName
+ <?php echo $form->resource
->label(__('Authorized form of name'))
->renderLabel() ?>
</th>
</tr><tr>
<td colspan="4">
- <?php echo $form->authorizedFormOfName->render(array('class' =>
'form-autocomplete')) ?>
+ <?php echo $form->resource->render(array('class' =>
'form-autocomplete')) ?>
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'function', 'action' => 'autocomplete')) ?>"/>
- <?php echo $form->authorizedFormOfName
+ <?php echo $form->resource
->help(__('"Record the authorised form of name and any unique
identifier of the related function." (ISDF 5.3.1)'))
->renderHelp() ?>
</td>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Sun Oct 17 19:00:20 2010 (r8215)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Sun Oct 17 19:09:31 2010 (r8216)
@@ -43,7 +43,7 @@
// Template for new display table rows
$rowTemplate = '<tr id="{relatedResource[id]}">'
.' <td>'
- ." {{$form->object->renderName()}}"
+ ." {{$form->resource->renderName()}}"
.' </td><td>'
." {{$form->description->renderName()}}"
.' </td><td>'
@@ -87,15 +87,15 @@
</caption><tbody>
<tr>
<th colspan="4">
- <?php echo $form->object
+ <?php echo $form->resource
->label(__('Title'))
->renderLabel() ?>
</th>
</tr><tr>
<td colspan="4">
- <?php echo $form->object->render(array('class' =>
'form-autocomplete')) ?>
+ <?php echo $form->resource->render(array('class' =>
'form-autocomplete')) ?>
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'informationobject', 'action' => 'autocomplete'))
?>"/>
- <?php echo $form->object
+ <?php echo $form->resource
->help(__('Select the title from the drop-down menu; enter the
identifier or the first few letters to narrow the choices. (ISDF 6.1)'))
->renderHelp() ?>
</td>
--
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.
