Author: sevein
Date: Wed Sep 7 15:03:47 2011
New Revision: 9687
Log:
s/rightNote/rightsNote, fixes issue 2050
Modified:
trunk/apps/qubit/modules/right/actions/editComponent.class.php
trunk/apps/qubit/modules/right/actions/indexAction.class.php
trunk/apps/qubit/modules/right/templates/_edit.php
trunk/apps/qubit/modules/right/templates/_right.php
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/RightsI18nTableMap.php
trunk/lib/model/om/BaseRightsI18n.php
Modified: trunk/apps/qubit/modules/right/actions/editComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/right/actions/editComponent.class.php Wed Sep
7 14:50:11 2011 (r9686)
+++ trunk/apps/qubit/modules/right/actions/editComponent.class.php Wed Sep
7 15:03:47 2011 (r9687)
@@ -28,7 +28,7 @@
'startDate',
'restriction',
'rightsHolder',
- 'rightNote',
+ 'rightsNote',
'copyrightStatus',
'copyrightStatusDate',
'copyrightJurisdiction',
@@ -119,7 +119,7 @@
case 'statuteJurisdiction':
case 'statuteCitation':
case 'statuteNote':
- case 'rightNote':
+ case 'rightsNote':
$this->form->setValidator($name, new sfValidatorString);
$this->form->setWidget($name, new sfWidgetFormTextarea);
Modified: trunk/apps/qubit/modules/right/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/right/actions/indexAction.class.php Wed Sep
7 14:50:11 2011 (r9686)
+++ trunk/apps/qubit/modules/right/actions/indexAction.class.php Wed Sep
7 15:03:47 2011 (r9687)
@@ -45,9 +45,9 @@
$value['rightsHolder'] = $this->context->routing->generate(null,
array($this->resource->rightsHolder, 'module' => 'rightsholder'));
}
- if (isset($this->resource->rightNote))
+ if (isset($this->resource->rightsNote))
{
- $value['rightNote'] = $this->resource->rightNote;
+ $value['rightsNote'] = $this->resource->rightsNote;
}
if (isset($this->resource->basis))
@@ -71,7 +71,6 @@
if (isset($this->resource->copyrightJurisdiction))
{
- // TODO serialize/unserialize?
$value['copyrightJurisdiction'] = $this->resource->copyrightJurisdiction;
}
Modified: trunk/apps/qubit/modules/right/templates/_edit.php
==============================================================================
--- trunk/apps/qubit/modules/right/templates/_edit.php Wed Sep 7 14:50:11
2011 (r9686)
+++ trunk/apps/qubit/modules/right/templates/_edit.php Wed Sep 7 15:03:47
2011 (r9687)
@@ -143,7 +143,7 @@
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'rightsholder', 'action' => 'autocomplete')) ?>"/>
</div>
- <?php echo $form->rightNote->renderRow() ?>
+ <?php echo $form->rightsNote->renderRow() ?>
<?php echo $form->basis->renderRow() ?>
Modified: trunk/apps/qubit/modules/right/templates/_right.php
==============================================================================
--- trunk/apps/qubit/modules/right/templates/_right.php Wed Sep 7 14:50:11
2011 (r9686)
+++ trunk/apps/qubit/modules/right/templates/_right.php Wed Sep 7 15:03:47
2011 (r9687)
@@ -18,7 +18,7 @@
<?php echo render_show(__('Rights holder'),
link_to(render_value($resource->rightsHolder), array($resource->rightsHolder,
'module' => 'rightsholder'))) ?>
<?php endif; ?>
- <?php echo render_show(__('Right note'),
render_value($resource->getRightNote(array('cultureFallback' => true)))) ?>
+ <?php echo render_show(__('Rights note'),
render_value($resource->getRightsNote(array('cultureFallback' => true)))) ?>
<?php echo render_show(__('Basis'), render_value($resource->basis)) ?>
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Wed Sep 7 14:50:11 2011 (r9686)
+++ trunk/config/schema.yml Wed Sep 7 15:03:47 2011 (r9687)
@@ -283,7 +283,7 @@
rights_i18n:
restriction: longvarchar
- right_note: longvarchar
+ rights_note: longvarchar
copyright_note: longvarchar
license_identifier: longvarchar
license_terms: longvarchar
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Wed Sep 7 14:50:11 2011 (r9686)
+++ trunk/data/sql/lib.model.schema.sql Wed Sep 7 15:03:47 2011 (r9687)
@@ -945,7 +945,7 @@
CREATE TABLE `rights_i18n`
(
`restriction` TEXT,
- `right_note` TEXT,
+ `rights_note` TEXT,
`copyright_note` TEXT,
`license_identifier` TEXT,
`license_terms` TEXT,
Modified: trunk/lib/model/map/RightsI18nTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsI18nTableMap.php Wed Sep 7 14:50:11 2011
(r9686)
+++ trunk/lib/model/map/RightsI18nTableMap.php Wed Sep 7 15:03:47 2011
(r9687)
@@ -37,7 +37,7 @@
$this->setUseIdGenerator(false);
// columns
$this->addColumn('RESTRICTION', 'restriction', 'LONGVARCHAR',
false, null, null);
- $this->addColumn('RIGHT_NOTE', 'rightNote', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('RIGHTS_NOTE', 'rightsNote', 'LONGVARCHAR',
false, null, null);
$this->addColumn('COPYRIGHT_NOTE', 'copyrightNote',
'LONGVARCHAR', false, null, null);
$this->addColumn('LICENSE_IDENTIFIER', 'licenseIdentifier',
'LONGVARCHAR', false, null, null);
$this->addColumn('LICENSE_TERMS', 'licenseTerms',
'LONGVARCHAR', false, null, null);
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Wed Sep 7 14:50:11 2011
(r9686)
+++ trunk/lib/model/om/BaseRightsI18n.php Wed Sep 7 15:03:47 2011
(r9687)
@@ -8,7 +8,7 @@
TABLE_NAME = 'rights_i18n',
RESTRICTION = 'rights_i18n.RESTRICTION',
- RIGHT_NOTE = 'rights_i18n.RIGHT_NOTE',
+ RIGHTS_NOTE = 'rights_i18n.RIGHTS_NOTE',
COPYRIGHT_NOTE = 'rights_i18n.COPYRIGHT_NOTE',
LICENSE_IDENTIFIER = 'rights_i18n.LICENSE_IDENTIFIER',
LICENSE_TERMS = 'rights_i18n.LICENSE_TERMS',
@@ -22,7 +22,7 @@
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(QubitRightsI18n::RESTRICTION);
- $criteria->addSelectColumn(QubitRightsI18n::RIGHT_NOTE);
+ $criteria->addSelectColumn(QubitRightsI18n::RIGHTS_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::COPYRIGHT_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::LICENSE_IDENTIFIER);
$criteria->addSelectColumn(QubitRightsI18n::LICENSE_TERMS);
--
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.
