Author: KRavEN
Date: 2010-05-20 12:40:24 +0200 (Thu, 20 May 2010)
New Revision: 29547
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormChoice.class.php
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormSelect.class.php
Log:
fixed width attribute on mant to many fields. cleaned up select widgets.
fixed bug with gridpanelConfig forceFit config check.
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
2010-05-20 10:18:34 UTC (rev 29546)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsModule/admin/parts/gridpanelConfiguration.php
2010-05-20 10:40:24 UTC (rev 29547)
@@ -11,7 +11,7 @@
'stateful' => true,
'stateId' => '<?php echo $this->getModuleName() ?>gridpanel',
'viewConfig' => array(
- 'forceFit' => sfConfig::get('extjs_gen_plugin_list_forceFit',
true),
+ 'forceFit' => sfConfig::get('app_extjs_gen_plugin_list_forceFit',
true),
),
'sm' => 'this.cm.sm',
'plugins' => $this->getFormpanelPlugins(),
Modified:
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormChoice.class.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormChoice.class.php
2010-05-20 10:18:34 UTC (rev 29546)
+++
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormChoice.class.php
2010-05-20 10:40:24 UTC (rev 29547)
@@ -80,41 +80,11 @@
if ($this->getOption('multiple'))
{
$attributes['multiple'] = 'multiple';
-
-// if ('[]' != substr($name, -2))
-// {
-// $name .= '[]';
-// }
}
-// if (!$this->getOption('renderer') && !$this->getOption('renderer_class')
&& $this->getOption('expanded'))
-// {
-// unset($attributes['multiple']);
-// }
-
return $this->getRenderer()->render($name, $value, $attributes, $errors);
}
- /**
- * Gets the stylesheet paths associated with the widget.
- *
- * @return array An array of stylesheet paths
- */
- public function getStylesheets()
- {
- return $this->getRenderer()->getStylesheets();
- }
-
- /**
- * Gets the JavaScript paths associated with the widget.
- *
- * @return array An array of JavaScript paths
- */
- public function getJavaScripts()
- {
- return $this->getRenderer()->getJavaScripts();
- }
-
public function getRenderer()
{
if ($this->getOption('renderer'))
Modified:
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormSelect.class.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormSelect.class.php
2010-05-20 10:18:34 UTC (rev 29546)
+++
plugins/ExtjsGeneratorPlugin/trunk/lib/widget/ExtjsWidgetFormSelect.class.php
2010-05-20 10:40:24 UTC (rev 29547)
@@ -36,7 +36,6 @@
parent::configure($options, $attributes);
$this->addOption('context', 'form');
- $this->addOption('multiple', false);
$this->addOption('allowClear', true);
$this->addOption('defaultValue');
}
@@ -73,6 +72,7 @@
),
'valueField' => 'value',
'displayField' => 'display',
+ 'width' => isset($attributes['width']) ? $attributes['width'] : 200
),
array(
'legend' => 'Unassociated',
@@ -85,9 +85,11 @@
),
'valueField' => 'value',
'displayField' => 'display',
+ 'width' => isset($attributes['width']) ? $attributes['width'] : 200
)
)
);
+ unset($attributes['width']);
}
else
{
@@ -138,22 +140,7 @@
$options = array();
foreach ($choices as $key => $option)
{
-// if (is_array($option))
-// {
-// $options[] = $this->renderContentTag('optgroup', implode("\n",
$this->getOptionsForSelect($value, $option)), array('label' =>
self::escapeOnce($key)));
-// }
-// else
-// {
-// $attributes = array('value' => self::escapeOnce($key));
-// if (isset($value_set[strval($key)]))
-// {
-// $attributes['selected'] = 'selected';
-// }
-
-// var_export($attributes);
-// $options[] = $this->renderContentTag('option',
self::escapeOnce($option), $attributes);
- $options[] = array(self::escapeOnce($key), $option);
-// }
+ $options[] = array(self::escapeOnce($key), $option);
}
$this->attributes = $mainAttributes;
--
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.
