Author: pmacadden
Date: 2010-04-29 20:26:34 +0200 (Thu, 29 Apr 2010)
New Revision: 29316
Modified:
plugins/pmModuleEnablerPlugin/branches/1.0/README
plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmConfiguration.php
plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmModule.php
plugins/pmModuleEnablerPlugin/branches/1.0/modules/pmconfiguration/actions/actions.class.php
Log:
updated 1.0 branch
Modified: plugins/pmModuleEnablerPlugin/branches/1.0/README
===================================================================
--- plugins/pmModuleEnablerPlugin/branches/1.0/README 2010-04-29 14:49:50 UTC
(rev 29315)
+++ plugins/pmModuleEnablerPlugin/branches/1.0/README 2010-04-29 18:26:34 UTC
(rev 29316)
@@ -32,16 +32,16 @@
* Enable the pmconfiguration module and all your addon modules
[yml]
- # in apps/<app>/backend/config/settings.yml
+ # in apps/<app>/config/settings.yml
enabled_modules: [default, ..., pmconfiguration, coolModule,
anotherCoolModule]
* Configure the plugin
[yml]
- # in apps/<app>/backend/config/app.yml
+ # in apps/<app>/config/app.yml
all:
# ...
- pm_module_loader:
+ pm_module_enabler:
always_enabled: [default, pmconfiguration] # this means that
default and pmconfiguration modules will be always enabled
modules_names:
coolModule: Cool module # label to show in the
checkbox
Modified:
plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmConfiguration.php
===================================================================
--- plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmConfiguration.php
2010-04-29 14:49:50 UTC (rev 29315)
+++ plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmConfiguration.php
2010-04-29 18:26:34 UTC (rev 29316)
@@ -23,7 +23,7 @@
public function loadModules()
{
$enabled_modules = sfConfig::get('sf_enabled_modules', array());
- $always_enabled = sfConfig::get('app_pm_module_loader_always_enabled',
array());
+ $always_enabled = sfConfig::get('app_pm_module_enabler_always_enabled',
array());
foreach ($enabled_modules as $enabled_module)
{
@@ -46,7 +46,7 @@
public function isEnabled($module_name)
{
$ret = false;
- $always_enabled = sfConfig::get('app_pm_module_loader_always_enabled',
array());
+ $always_enabled = sfConfig::get('app_pm_module_enabler_always_enabled',
array());
if ($module_name == 'pmconfiguration')
{
@@ -54,7 +54,7 @@
}
else
{
- if (!in_array($module_name, sfConfig::get('sf_enabled_modules')) ||
in_array($module_name, $always_enabled))
+ if (!in_array($module_name, sfConfig::get('sf_enabled_modules',
array())) || in_array($module_name, $always_enabled))
{
$ret = true;
}
@@ -65,6 +65,8 @@
if ($pm_module->getName() == $module_name &&
$pm_module->getIsEnabled())
{
$ret = true;
+
+ break;
}
}
}
Modified: plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmModule.php
===================================================================
--- plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmModule.php
2010-04-29 14:49:50 UTC (rev 29315)
+++ plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmModule.php
2010-04-29 18:26:34 UTC (rev 29316)
@@ -4,7 +4,7 @@
{
public function __toString()
{
- $modules_names = sfConfig::get('app_pm_module_loader_modules_names',
array());
+ $modules_names = sfConfig::get('app_pm_module_enabler_modules_names',
array());
return array_key_exists($this->getName(),
$modules_names)?$modules_names[$this->getName()]:$this->getName();
}
Modified:
plugins/pmModuleEnablerPlugin/branches/1.0/modules/pmconfiguration/actions/actions.class.php
===================================================================
---
plugins/pmModuleEnablerPlugin/branches/1.0/modules/pmconfiguration/actions/actions.class.php
2010-04-29 14:49:50 UTC (rev 29315)
+++
plugins/pmModuleEnablerPlugin/branches/1.0/modules/pmconfiguration/actions/actions.class.php
2010-04-29 18:26:34 UTC (rev 29316)
@@ -44,7 +44,7 @@
$enabled_ids = $request->getParameter('pm_configuration[enabled_ids]');
- $all_dependencies = sfConfig::get('app_pm_module_loader_dependencies',
array());
+ $all_dependencies = sfConfig::get('app_pm_module_enabler_dependencies',
array());
foreach ($pm_configuration->getpmModules() as $pm_module)
{
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
