Author: Jonathan.Wage
Date: 2010-01-14 21:20:26 +0100 (Thu, 14 Jan 2010)
New Revision: 26652
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with configuration saving
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 20:02:03 UTC (rev
26651)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-14 20:20:26 UTC (rev
26652)
@@ -9,22 +9,22 @@
# Configure the modules which are Sympal admin modules. This allows us to
# automatically load the admin theme for these modules.
admin_modules:
- - sympal_admin
- - sympal_config
- - sympal_content
- - sympal_content_menu_item
- - sympal_content_types
- - sympal_dashboard
- - sympal_redirects
- - sympal_sites
- - sympal_themes
- - sympal_users
- - sympal_groups
- - sympal_permissions
- - sympal_menu_items
- - sympal_plugin_manager
- - sympal_assets
- - sympal_upgrade
+ sympal_admin: ~
+ sympal_config: ~
+ sympal_content: ~
+ sympal_content_menu_item: ~
+ sympal_content_types: ~
+ sympal_dashboard: ~
+ sympal_redirects: ~
+ sympal_sites: ~
+ sympal_themes: ~
+ sympal_users: ~
+ sympal_groups: ~
+ sympal_permissions: ~
+ sympal_menu_items: ~
+ sympal_plugin_manager: ~
+ sympal_assets: ~
+ sympal_upgrade: ~
# Minify css and javascript
minifier:
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-14 20:02:03 UTC (rev 26651)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfiguration.class.php
2010-01-14 20:20:26 UTC (rev 26652)
@@ -246,6 +246,13 @@
{
$request = $this->_symfonyContext->getRequest();
+ $module = $request->getParameter('module');
+ $adminModules = sfSympalConfig::get('admin_modules');
+ if (array_key_exists($module, $adminModules))
+ {
+ return sfSympalConfig::get('admin_theme', null, 'admin');
+ }
+
if (sfSympalConfig::get('allow_changing_theme_by_url'))
{
$user = $this->_symfonyContext->getUser();
@@ -262,13 +269,6 @@
}
}
- $module = $request->getParameter('module');
- $adminModules = sfSympalConfig::get('admin_modules');
- if (in_array($module, $adminModules))
- {
- return sfSympalConfig::get('admin_theme', null, 'admin');
- }
-
if ($theme = sfSympalConfig::get($module, 'theme'))
{
return $theme;
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-14 20:02:03 UTC (rev 26651)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-14 20:20:26 UTC (rev 26652)
@@ -117,11 +117,23 @@
protected function _buildArrayToWrite()
{
- $original = sfYaml::load(sfConfig::get('sf_config_dir').'/app.yml');
+ $old = $this->getDefaults();
+ $new = $this->getValues();
+
$array = array();
- $array['all']['sympal_config'] = $this->getValues();
+ $array['all']['sympal_config'] = array();
+ foreach ($new as $key => $value)
+ {
+ if ($value != $old[$key])
+ {
+ $array['all']['sympal_config'][$key] = $value;
+ }
+ }
- return sfToolkit::arrayDeepMerge($original, $array);
+ return sfToolkit::arrayDeepMerge(
+ sfYaml::load(sfConfig::get('sf_config_dir').'/app.yml'),
+ $array
+ );
}
public function getGroups()
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-01-14 20:02:03 UTC (rev 26651)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-01-14 20:20:26 UTC (rev 26652)
@@ -13,7 +13,7 @@
<?php echo $form->renderHiddenFields() ?>
<?php foreach ($groups as $group): ?>
<fieldset id="sf_fieldset_config_<?php echo strtolower($group) ?>">
- <h2><?php echo ucwords(sfInflector::humanize($group)) ?></h2>
+ <h2><?php echo ucwords(sfInflector::humanize(str_replace('-', '_',
$group))) ?></h2>
<?php echo $form->renderGroup($group) ?>
</fieldset>
<?php endforeach; ?>
--
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.
