Author: rande
Date: 2010-01-11 14:53:05 +0100 (Mon, 11 Jan 2010)
New Revision: 26474
Added:
plugins/psToolboxPlugin/trunk/config/
plugins/psToolboxPlugin/trunk/config/config_handlers.yml
plugins/psToolboxPlugin/trunk/config/psToolboxPluginConfiguration.class.php
plugins/psToolboxPlugin/trunk/lib/config/
plugins/psToolboxPlugin/trunk/lib/config/psToolboxConfigHandler.class.php
Modified:
plugins/psToolboxPlugin/trunk/lib/cache/psNamedCache.class.php
plugins/psToolboxPlugin/trunk/lib/widget/psWidgetFormJQueryTokenAutocompleter.class.php
plugins/psToolboxPlugin/trunk/package.xml
plugins/psToolboxPlugin/trunk/web/js/psWidgetFormJQueryTokenAutocompleter.js
Log:
[psToolboxPlugin] Add config handler
Added: plugins/psToolboxPlugin/trunk/config/config_handlers.yml
===================================================================
--- plugins/psToolboxPlugin/trunk/config/config_handlers.yml
(rev 0)
+++ plugins/psToolboxPlugin/trunk/config/config_handlers.yml 2010-01-11
13:53:05 UTC (rev 26474)
@@ -0,0 +1,2 @@
+config/psToolboxPlugin.yml:
+ class: psToolboxConfigHandler
\ No newline at end of file
Added:
plugins/psToolboxPlugin/trunk/config/psToolboxPluginConfiguration.class.php
===================================================================
--- plugins/psToolboxPlugin/trunk/config/psToolboxPluginConfiguration.class.php
(rev 0)
+++ plugins/psToolboxPlugin/trunk/config/psToolboxPluginConfiguration.class.php
2010-01-11 13:53:05 UTC (rev 26474)
@@ -0,0 +1,28 @@
+<?php
+/*
+ * This file is part of the psToolboxPlugin package.
+ * (c) 2010 Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package psToolboxPlugin
+ * @author Thomas Rabaix <[email protected]>
+ * @version SVN: $Id$
+ */
+class psToolboxPluginConfiguration extends sfPluginConfiguration
+{
+
+ public function initialize()
+ {
+ if($this->configuration instanceof sfApplicationConfiguration)
+ {
+
include($this->configuration->getConfigCache()->checkConfig(sfConfig::get('sf_config_dir').'/psToolboxPlugin.yml'));
+ }
+ }
+
+}
\ No newline at end of file
Modified: plugins/psToolboxPlugin/trunk/lib/cache/psNamedCache.class.php
===================================================================
--- plugins/psToolboxPlugin/trunk/lib/cache/psNamedCache.class.php
2010-01-11 12:50:31 UTC (rev 26473)
+++ plugins/psToolboxPlugin/trunk/lib/cache/psNamedCache.class.php
2010-01-11 13:53:05 UTC (rev 26474)
@@ -1,5 +1,21 @@
<?php
+/*
+ * This file is part of the psToolboxPlugin package.
+ * (c) 2009-2010 Julien Lirochon
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ *
+ *
+ * @package psToolboxPlugin
+ * @author Julien Lirochon
+ * @author Loic Vernet
+ *
+ * @version SVN: $Id$
+ */
class psNamedCache
{
static protected $instance = null;
@@ -18,7 +34,7 @@
protected function initialize()
{
- $config = sfConfig::get('app_psToolbox_named_cache', array());
+ $config = sfConfig::get('ps_toolbox_named_cache', array());
$options = array(
'class' => 'sfNoCache',
Added: plugins/psToolboxPlugin/trunk/lib/config/psToolboxConfigHandler.class.php
===================================================================
--- plugins/psToolboxPlugin/trunk/lib/config/psToolboxConfigHandler.class.php
(rev 0)
+++ plugins/psToolboxPlugin/trunk/lib/config/psToolboxConfigHandler.class.php
2010-01-11 13:53:05 UTC (rev 26474)
@@ -0,0 +1,54 @@
+<?php
+/*
+ * This file is part of the psToolboxPlugin package.
+ * (c) 2010 Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package psToolboxPlugin
+ * @author Thomas Rabaix <[email protected]>
+ * @version SVN: $Id$
+ */
+class psToolboxConfigHandler extends sfYamlConfigHandler
+{
+
+ /**
+ * compile configuration for the file psToolboxPlugin.yml
+ *
+ * @param array $configFiles
+ * @return string
+ */
+ public function execute($configFiles)
+ {
+ $this->initialize();
+
+ // Parse the yaml
+ $config = $this->parseYamls($configFiles);
+
+ $config = $this->replaceConstants($config);
+
+ $config = sfToolkit::arrayDeepMerge(
+ isset($config['default']) && is_array($config['default']) ?
$config['default'] : array(),
+ isset($config['all']) && is_array($config['all']) ? $config['all'] :
array(),
+ isset($config[sfConfig::get('sf_environment')]) &&
is_array($config[sfConfig::get('sf_environment')]) ?
$config[sfConfig::get('sf_environment')] : array()
+ );
+
+ $configNew = array();
+ foreach($config as $name => $value)
+ {
+ $configNew['ps_toolbox_'.$name] = $value;
+ }
+
+ // compile data
+ $retval = sprintf("<?php\n".
+ "// auto-generated by psToolboxConfigHandler\n".
+ "// date: %s\n%s\n", date('Y/m/d H:i:s'),
"sfConfig::add(unserialize('".serialize($configNew)."'));\n");
+
+ return $retval;
+ }
+}
Modified:
plugins/psToolboxPlugin/trunk/lib/widget/psWidgetFormJQueryTokenAutocompleter.class.php
===================================================================
---
plugins/psToolboxPlugin/trunk/lib/widget/psWidgetFormJQueryTokenAutocompleter.class.php
2010-01-11 12:50:31 UTC (rev 26473)
+++
plugins/psToolboxPlugin/trunk/lib/widget/psWidgetFormJQueryTokenAutocompleter.class.php
2010-01-11 13:53:05 UTC (rev 26474)
@@ -1,5 +1,19 @@
<?php
+/*
+ * This file is part of the psToolboxPlugin package.
+ * (c) 2009-2010 Julien Lirochon
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ *
+ *
+ * @package psToolboxPlugin
+ * @author Julien Lirochon
+ * @version SVN: $Id$
+ */
class psWidgetFormJQueryTokenAutocompleter extends sfWidgetFormSelectMany
{
public function configure($options = array(), $attributes = array())
Modified: plugins/psToolboxPlugin/trunk/package.xml
===================================================================
--- plugins/psToolboxPlugin/trunk/package.xml 2010-01-11 12:50:31 UTC (rev
26473)
+++ plugins/psToolboxPlugin/trunk/package.xml 2010-01-11 13:53:05 UTC (rev
26474)
@@ -12,8 +12,8 @@
</lead>
<date>2009-07-14</date>
<version>
- <release>0.1.0</release>
- <api>0.1.0</api>
+ <release>0.2.0</release>
+ <api>0.2.0</api>
</version>
<stability>
<release>alpha</release>
@@ -27,7 +27,14 @@
<dir name="widget">
<file name="psWidgetFormJQueryTokenAutocompleter.class.php"
role="data"/>
</dir>
+ <dir name="config">
+ <file name="psToolboxConfigHandler.class.php" role="data" />
+ </dir>
</dir>
+ <dir name="config">
+ <file name="config_handlers.yml" role="data"/>
+ <file name="psToolboxPluginConfiguration.class" role="data"/>
+ </dir>
<dir name="web">
<dir name="js">
<file name="psWidgetFormJQueryTokenAutocompleter.js" role="data"/>
Modified:
plugins/psToolboxPlugin/trunk/web/js/psWidgetFormJQueryTokenAutocompleter.js
===================================================================
---
plugins/psToolboxPlugin/trunk/web/js/psWidgetFormJQueryTokenAutocompleter.js
2010-01-11 12:50:31 UTC (rev 26473)
+++
plugins/psToolboxPlugin/trunk/web/js/psWidgetFormJQueryTokenAutocompleter.js
2010-01-11 13:53:05 UTC (rev 26474)
@@ -1,5 +1,18 @@
-// $Id$
+/*
+ * This file is part of the psToolboxPlugin package.
+ * (c) 2009-2010 Julien Lirochon
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ *
+ *
+ * @package psToolboxPlugin
+ * @author Julien Lirochon
+ * @version SVN: $Id$
+ */
psWFJTADefaultFormatter = {
formatToken: function(data) {
return data.label + ' %close%';
--
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.