Author: david
Date: Thu Jul 26 15:08:56 2012
New Revision: 11992
Log:
Drop QubitSetting::getSettingByName() in favour of getByName()
Modified:
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitSetting.php
trunk/lib/task/getVersionTask.class.php
trunk/lib/task/migrate/arUpgrader110.class.php
trunk/plugins/qtAccessionPlugin/lib/model/QubitAccession.php
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Jul
26 14:51:09 2012 (r11991)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Jul
26 15:08:56 2012 (r11992)
@@ -82,7 +82,7 @@
// if validation fails. By default, their values are not included in
// $request->parameterHolder (and thus are not bound) because their
// <input> field is disabled.
- $version = (null !== $setting =
QubitSetting::getSettingByName('version')) ?
$setting->getValue(array('sourceCulture'=>true)) : null;
+ $version = (null !== $setting = QubitSetting::getByName('version')) ?
$setting->getValue(array('sourceCulture'=>true)) : null;
$this->globalForm->bind(array_merge($request->global_settings,
array('version'=>$version)));
if ($this->globalForm->isValid())
{
@@ -214,27 +214,27 @@
{
// Get global settings
$version = qubitConfiguration::VERSION;
- if (null !== $setting = QubitSetting::getSettingByName('version'))
+ if (null !== $setting = QubitSetting::getByName('version'))
{
$version .= ' - '.$setting->getValue(array('sourceCulture' => true));
}
- $checkForUpdates = QubitSetting::getSettingByName('check_for_updates');
- $refImageMaxWidth =
QubitSetting::getSettingByName('reference_image_maxwidth');
- $hitsPerPage = QubitSetting::getSettingByName('hits_per_page');
- $accessionMask = QubitSetting::getSettingByName('accession_mask');
- $accessionCounter = QubitSetting::getSettingByName('accession_counter');
- $separatorCharacter =
QubitSetting::getSettingByName('separator_character');
- $inheritCodeInformationObject =
QubitSetting::getSettingByName('inherit_code_informationobject');
- $sortTreeviewInformationObject =
QubitSetting::getSettingByName('sort_treeview_informationobject');
- $sortBrowserUser = QubitSetting::getSettingByName('sort_browser_user');
- $sortBrowserAnonymous =
QubitSetting::getSettingByName('sort_browser_anonymous');
- $multiRepository = QubitSetting::getSettingByName('multi_repository');
- $repositoryQuota = QubitSetting::getSettingByName('repository_quota');
- $explodeMultipageFiles =
QubitSetting::getSettingByName('explode_multipage_files');
- $showTooltips = QubitSetting::getSettingByName('show_tooltips');
- $defaultPubStatus = QubitSetting::getSettingByName('defaultPubStatus');
- $swordDepositDir = QubitSetting::getSettingByName('sword_deposit_dir');
+ $checkForUpdates = QubitSetting::getByName('check_for_updates');
+ $refImageMaxWidth = QubitSetting::getByName('reference_image_maxwidth');
+ $hitsPerPage = QubitSetting::getByName('hits_per_page');
+ $accessionMask = QubitSetting::getByName('accession_mask');
+ $accessionCounter = QubitSetting::getByName('accession_counter');
+ $separatorCharacter = QubitSetting::getByName('separator_character');
+ $inheritCodeInformationObject =
QubitSetting::getByName('inherit_code_informationobject');
+ $sortTreeviewInformationObject =
QubitSetting::getByName('sort_treeview_informationobject');
+ $sortBrowserUser = QubitSetting::getByName('sort_browser_user');
+ $sortBrowserAnonymous = QubitSetting::getByName('sort_browser_anonymous');
+ $multiRepository = QubitSetting::getByName('multi_repository');
+ $repositoryQuota = QubitSetting::getByName('repository_quota');
+ $explodeMultipageFiles =
QubitSetting::getByName('explode_multipage_files');
+ $showTooltips = QubitSetting::getByName('show_tooltips');
+ $defaultPubStatus = QubitSetting::getByName('defaultPubStatus');
+ $swordDepositDir = QubitSetting::getByName('sword_deposit_dir');
// Set defaults for global form
$this->globalForm->setDefaults(array(
@@ -268,7 +268,7 @@
// Check for updates
if (null !== $checkForUpdates = $thisForm->getValue('check_for_updates'))
{
- $setting = QubitSetting::getSettingByName('check_for_updates');
+ $setting = QubitSetting::getByName('check_for_updates');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($checkForUpdates, array('sourceCulture' => true));
@@ -280,7 +280,7 @@
{
if (intval($refMaxWidth) && $refMaxWidth > 0)
{
- $setting = QubitSetting::getSettingByName('reference_image_maxwidth');
+ $setting = QubitSetting::getByName('reference_image_maxwidth');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($refMaxWidth, array('sourceCulture'=>true));
@@ -293,7 +293,7 @@
{
if (intval($hitsPerPage) && $hitsPerPage > 0)
{
- $setting = QubitSetting::getSettingByName('hits_per_page');
+ $setting = QubitSetting::getByName('hits_per_page');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($hitsPerPage, array('sourceCulture'=>true));
@@ -304,7 +304,7 @@
// Accession mask
if (null !== $accessionMask = $thisForm->getValue('accession_mask'))
{
- $setting = QubitSetting::getSettingByName('accession_mask');
+ $setting = QubitSetting::getByName('accession_mask');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($accessionMask, array('sourceCulture' => true));
@@ -316,7 +316,7 @@
{
if (intval($accessionCounter) && $accessionCounter > -1)
{
- $setting = QubitSetting::getSettingByName('accession_counter');
+ $setting = QubitSetting::getByName('accession_counter');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($accessionCounter, array('sourceCulture' => true));
@@ -327,7 +327,7 @@
// Separator character
if (null !== $separatorCharacter =
$thisForm->getValue('separator_character'))
{
- $setting = QubitSetting::getSettingByName('separator_character');
+ $setting = QubitSetting::getByName('separator_character');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($separatorCharacter, array('sourceCulture' => true));
@@ -337,7 +337,7 @@
// Inherit Code (Information Object)
if (null !== $inheritCodeInformationObjectValue =
$thisForm->getValue('inherit_code_informationobject'))
{
- $setting =
QubitSetting::getSettingByName('inherit_code_informationobject');
+ $setting = QubitSetting::getByName('inherit_code_informationobject');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($inheritCodeInformationObjectValue,
array('sourceCulture'=>true));
@@ -347,7 +347,7 @@
// Sort Treeview (Information Object)
if (null !== $sortTreeviewInformationObjectValue =
$thisForm->getValue('sort_treeview_informationobject'))
{
- $setting =
QubitSetting::getSettingByName('sort_treeview_informationobject');
+ $setting = QubitSetting::getByName('sort_treeview_informationobject');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($sortTreeviewInformationObjectValue,
array('sourceCulture'=>true));
@@ -357,7 +357,7 @@
// Sort Browser (for users)
if (null !== $sortBrowserUser = $thisForm->getValue('sort_browser_user'))
{
- $setting = QubitSetting::getSettingByName('sort_browser_user');
+ $setting = QubitSetting::getByName('sort_browser_user');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($sortBrowserUser, array('sourceCulture'=>true));
@@ -367,7 +367,7 @@
// Sort Browser (for anonymous)
if (null !== $sortBrowserAnonymous =
$thisForm->getValue('sort_browser_anonymous'))
{
- $setting = QubitSetting::getSettingByName('sort_browser_anonymous');
+ $setting = QubitSetting::getByName('sort_browser_anonymous');
// Force sourceCulture update to prevent discrepency in settings
between cultures
$setting->setValue($sortBrowserAnonymous, array('sourceCulture'=>true));
@@ -378,7 +378,7 @@
// Multi-repository radio button
if (null !== $multiRepositoryValue =
$thisForm->getValue('multi_repository'))
{
- $setting = QubitSetting::getSettingByName('multi_repository');
+ $setting = QubitSetting::getByName('multi_repository');
// Add setting if it's not already in the sampleData.yml file for
// backwards compatiblity with v1.0.3 sampleData.yml file
@@ -395,7 +395,7 @@
// Repository upload quota
if (null !== $multiRepositoryValue =
$thisForm->getValue('repository_quota'))
{
- $setting = QubitSetting::getSettingByName('repository_quota');
+ $setting = QubitSetting::getByName('repository_quota');
// Add setting if it's not already in the sampleData.yml file for
// backwards compatiblity with v1.0.3 sampleData.yml file
@@ -412,7 +412,7 @@
// Upload multi-page files as multiple descriptions
if (null !== $explodeMultipageFiles =
$thisForm->getValue('explode_multipage_files'))
{
- $setting = QubitSetting::getSettingByName('explode_multipage_files');
+ $setting = QubitSetting::getByName('explode_multipage_files');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($explodeMultipageFiles, array('sourceCulture' =>
true));
@@ -422,7 +422,7 @@
// Show tooltips
if (null !== $showTooltips = $thisForm->getValue('show_tooltips'))
{
- $setting = QubitSetting::getSettingByName('show_tooltips');
+ $setting = QubitSetting::getByName('show_tooltips');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($showTooltips, array('sourceCulture' => true));
@@ -432,7 +432,7 @@
// Default publication status
if (null !== $defaultPubStatus = $thisForm->getValue('defaultPubStatus'))
{
- $setting = QubitSetting::getSettingByName('defaultPubStatus');
+ $setting = QubitSetting::getByName('defaultPubStatus');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($defaultPubStatus, array('sourceCulture' => true));
@@ -442,7 +442,7 @@
// SWORD deposit directory
if (null !== $swordDepositDir = $thisForm->getValue('sword_deposit_dir'))
{
- $setting = QubitSetting::getSettingByName('sword_deposit_dir');
+ $setting = QubitSetting::getByName('sword_deposit_dir');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($swordDepositDir, array('sourceCulture' => true));
@@ -458,8 +458,8 @@
protected function populateSiteInformationForm()
{
// Get site information settings
- $this->siteTitle = (null !== $siteTitle =
QubitSetting::getSettingByName('siteTitle')) ? $siteTitle : new QubitSetting;
- $this->siteDescription = (null !== $siteDescription =
QubitSetting::getSettingByName('siteDescription')) ? $siteDescription : new
QubitSetting;
+ $this->siteTitle = (null !== $siteTitle =
QubitSetting::getByName('siteTitle')) ? $siteTitle : new QubitSetting;
+ $this->siteDescription = (null !== $siteDescription =
QubitSetting::getByName('siteDescription')) ? $siteDescription : new
QubitSetting;
// Set defaults values
$this->siteInformationForm->setDefaults(array(
@@ -479,7 +479,7 @@
// Get Site Title
$siteTitle = $thisForm->getValue('site_title');
- $siteTitleSetting = QubitSetting::getSettingByName('siteTitle');
+ $siteTitleSetting = QubitSetting::getByName('siteTitle');
// Create new QubitSetting if site_title doesn't already exist
if (null === $siteTitleSetting)
@@ -491,7 +491,7 @@
// Save Site Description
$siteDescription = $thisForm->getValue('site_description');
- $siteDescSetting = QubitSetting::getSettingByName('siteDescription');
+ $siteDescSetting = QubitSetting::getByName('siteDescription');
// Create new QubitSetting if site_description doesn't already exist
if (null === $siteDescSetting)
@@ -592,11 +592,11 @@
protected function populateOaiRepositoryForm()
{
// Get OAI Repository settings
- $oaiEnabled = QubitSetting::getSettingByName('oai_enabled');
- $oaiRepositoryCode = QubitSetting::getSettingByName('oai_repository_code');
+ $oaiEnabled = QubitSetting::getByName('oai_enabled');
+ $oaiRepositoryCode = QubitSetting::getByName('oai_repository_code');
$oaiRepositoryIdentifier = QubitOai::getRepositoryIdentifier();
$sampleOaiIdentifier = QubitOai::getSampleIdentifier();
- $resumptionTokenLimit =
QubitSetting::getSettingByName('resumption_token_limit');
+ $resumptionTokenLimit = QubitSetting::getByName('resumption_token_limit');
// Set defaults for global form
$this->oaiRepositoryForm->setDefaults(array(
@@ -618,7 +618,7 @@
// OAI enabled radio button
if (null !== $oaiEnabledValue = $thisForm->getValue('oai_enabled'))
{
- $setting = QubitSetting::getSettingByName('oai_enabled');
+ $setting = QubitSetting::getByName('oai_enabled');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($oaiEnabledValue, array('sourceCulture'=>true));
@@ -627,7 +627,7 @@
// OAI repository code
$oaiRepositoryCodeValue = $thisForm->getValue('oai_repository_code');
- $setting = QubitSetting::getSettingByName('oai_repository_code');
+ $setting = QubitSetting::getByName('oai_repository_code');
$setting->setValue($oaiRepositoryCodeValue, array('sourceCulture'=>true));
$setting->save();
@@ -636,7 +636,7 @@
{
if (intval($resumptionTokenLimit) && $resumptionTokenLimit > 0)
{
- $setting = QubitSetting::getSettingByName('resumption_token_limit');
+ $setting = QubitSetting::getByName('resumption_token_limit');
$setting->setValue($resumptionTokenLimit,
array('sourceCulture'=>true));
$setting->save();
}
@@ -650,7 +650,7 @@
*/
protected function populateJobSchedulingForm()
{
- $useJobScheduler = QubitSetting::getSettingByName('use_job_scheduler');
+ $useJobScheduler = QubitSetting::getByName('use_job_scheduler');
$this->jobSchedulingForm->setDefaults(array(
'use_job_scheduler' => (isset($useJobScheduler)) ?
intval($useJobScheduler->getValue(array('sourceCulture' => true))) : 1
@@ -666,7 +666,7 @@
if (null !== $useJobSchedulerValue =
$thisForm->getValue('use_job_scheduler'))
{
- $setting = QubitSetting::getSettingByName('use_job_scheduler');
+ $setting = QubitSetting::getByName('use_job_scheduler');
$setting->setValue($useJobSchedulerValue, array('sourceCulture' =>
true));
$setting->save();
}
@@ -679,9 +679,9 @@
*/
protected function populateSecurityForm()
{
- $limitAdminIp = QubitSetting::getSettingByName('limit_admin_ip');
- $requireSslAdmin = QubitSetting::getSettingByName('require_ssl_admin');
- $requireStrongPasswords =
QubitSetting::getSettingByName('require_strong_passwords');
+ $limitAdminIp = QubitSetting::getByName('limit_admin_ip');
+ $requireSslAdmin = QubitSetting::getByName('require_ssl_admin');
+ $requireStrongPasswords =
QubitSetting::getByName('require_strong_passwords');
$this->securityForm->setDefaults(array(
'limit_admin_ip' => (isset($limitAdminIp)) ?
$limitAdminIp->getValue(array('sourceCulture'=>true)) : null,
@@ -698,7 +698,7 @@
$thisForm = $this->securityForm;
// Limit admin IP
- $setting = QubitSetting::getSettingByName('limit_admin_ip');
+ $setting = QubitSetting::getByName('limit_admin_ip');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($thisForm->getValue('limit_admin_ip'),
array('sourceCulture' => true));
$setting->save();
@@ -706,7 +706,7 @@
// Require SSL for admin funcionality
if (null !== $requireSslAdmin = $thisForm->getValue('require_ssl_admin'))
{
- $setting = QubitSetting::getSettingByName('require_ssl_admin');
+ $setting = QubitSetting::getByName('require_ssl_admin');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($requireSslAdmin, array('sourceCulture' => true));
@@ -716,7 +716,7 @@
// Require strong passwords
if (null !== $requireStrongPasswords =
$thisForm->getValue('require_strong_passwords'))
{
- $setting = QubitSetting::getSettingByName('require_strong_passwords');
+ $setting = QubitSetting::getByName('require_strong_passwords');
// Force sourceCulture update to prevent discrepency in settings between
cultures
$setting->setValue($requireStrongPasswords, array('sourceCulture' =>
true));
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Thu Jul 26 14:51:09 2012
(r11991)
+++ trunk/lib/model/QubitInformationObject.php Thu Jul 26 15:08:56 2012
(r11992)
@@ -1590,7 +1590,7 @@
public function getOaiIdentifier()
{
$domain = sfContext::getInstance()->request->getHost();
- $oaiRepositoryCode =
QubitSetting::getSettingByName('oai_repository_code')->getValue(array('sourceCulture'=>true));
+ $oaiRepositoryCode =
QubitSetting::getByName('oai_repository_code')->getValue(array('sourceCulture'=>true));
$oaiIdentifier =
'oai:'.$domain.':'.$oaiRepositoryCode.'_'.$this->getOaiLocalIdentifier();
return $oaiIdentifier;
Modified: trunk/lib/model/QubitSetting.php
==============================================================================
--- trunk/lib/model/QubitSetting.php Thu Jul 26 14:51:09 2012 (r11991)
+++ trunk/lib/model/QubitSetting.php Thu Jul 26 15:08:56 2012 (r11992)
@@ -157,11 +157,6 @@
return QubitSetting::getOne($criteria);
}
- static public function getSettingByName($name)
- {
- return $self::getByName($name);
- }
-
/**
* Get a setting by it's name & scope
*
Modified: trunk/lib/task/getVersionTask.class.php
==============================================================================
--- trunk/lib/task/getVersionTask.class.php Thu Jul 26 14:51:09 2012
(r11991)
+++ trunk/lib/task/getVersionTask.class.php Thu Jul 26 15:08:56 2012
(r11992)
@@ -40,7 +40,7 @@
$databaseManager = new sfDatabaseManager($this->configuration);
$conn = $databaseManager->getDatabase('propel')->getConnection();
- $setting =
QubitSetting::getSettingByName('version')->getValue(array('sourceCulture' =>
true));
+ $setting =
QubitSetting::getByName('version')->getValue(array('sourceCulture' => true));
$this->log(qubitConfiguration::VERSION.' v'.$setting);
}
Modified: trunk/lib/task/migrate/arUpgrader110.class.php
==============================================================================
--- trunk/lib/task/migrate/arUpgrader110.class.php Thu Jul 26 14:51:09
2012 (r11991)
+++ trunk/lib/task/migrate/arUpgrader110.class.php Thu Jul 26 15:08:56
2012 (r11992)
@@ -690,7 +690,7 @@
// Migrate to sfCaribou theme to users that are currently using sfClassic
case 73:
- if (null !== $setting = QubitSetting::getSettingByName('plugins'))
+ if (null !== $setting = QubitSetting::getByName('plugins'))
{
$plugin = 'sfClassicPlugin';
$replacement = 'qtTrilliumPlugin';
Modified: trunk/plugins/qtAccessionPlugin/lib/model/QubitAccession.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/QubitAccession.php Thu Jul
26 14:51:09 2012 (r11991)
+++ trunk/plugins/qtAccessionPlugin/lib/model/QubitAccession.php Thu Jul
26 15:08:56 2012 (r11992)
@@ -71,7 +71,7 @@
public static function getAccessionNumber($incrementCounter)
{
- $setting = QubitSetting::getSettingByName('accession_counter');
+ $setting = QubitSetting::getByName('accession_counter');
if ($incrementCounter)
{
--
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.
