Author: sid.gbf
Date: 2010-03-25 15:53:45 +0100 (Thu, 25 Mar 2010)
New Revision: 28787
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/createAction.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/editAction.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/newAction.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/updateAction.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/template/templates/_form.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/ExtendedUrlHelper.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/JavascriptAdminHelper.php
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/widget/sfWidgetFormjQueryDatePicker.class.php
Log:
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/createAction.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/createAction.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/createAction.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -1,12 +1,29 @@
- public function executeCreate(sfWebRequest $request)
- {
- $this-><?php echo $this->getSingularName() ?> =
$this->configuration->getForm()->getObject();
+ public function getFormParameters(sfWebRequest $request) {
+ $params = $request->getParameter('<?php echo $this->getSingularName() ?>',
false);
+ if(!$params)
+ $params = array();
+ return $params;
+ }
+
+ public function getObject(sfWebRequest $request) {
+ $params = $request->getParameterHolder()->getAll();
+ if(isset($params['id']) || isset($params['slug'])) {
+ $this-><?php echo $this->getSingularName() ?> =
$this->getRoute()->getObject();
+ } else {
+ $this-><?php echo $this->getSingularName() ?> = new <?php echo
$this->getModelClass() ?>();
+ }
if($request->getParameter('culture')) {
$this-><?php echo $this->getSingularName()
?>->setLanguage($request->getParameter('culture'));
}
+ return $this-><?php echo $this->getSingularName() ?>;
+ }
+ public function executeCreate(sfWebRequest $request)
+ {
+ $this-><?php echo $this->getSingularName() ?> = $this->getObject($request);
+
$this->form = $this->configuration->getForm($this-><?php echo
$this->getSingularName() ?>);
$this->processForm($request, $this->form);
$this->setTemplate('new');
- }
+ }
\ No newline at end of file
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/editAction.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/editAction.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/editAction.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -1,8 +1,5 @@
public function executeEdit(sfWebRequest $request)
{
- $this-><?php echo $this->getSingularName() ?> =
$this->getRoute()->getObject();
- if($request->getParameter('culture')) {
- $this-><?php echo $this->getSingularName()
?>->setLanguage($request->getParameter('culture'));
- }
+ $this-><?php echo $this->getSingularName() ?> = $this->getObject($request);
$this->form = $this->configuration->getForm($this-><?php echo
$this->getSingularName() ?>);
}
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/newAction.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/newAction.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/newAction.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -1,9 +1,6 @@
public function executeNew(sfWebRequest $request)
{
- $this-><?php echo $this->getSingularName() ?> =
$this->configuration->getForm()->getObject();
- if($request->getParameter('culture')) {
- $this-><?php echo $this->getSingularName()
?>->setLanguage($request->getParameter('culture'));
- }
+ $this-><?php echo $this->getSingularName() ?> = $this->getObject($request);
$this->form = $this->configuration->getForm($this-><?php echo
$this->getSingularName() ?>);
//$this-><?php echo $this->getSingularName() ?> = $this->form->getObject();
}
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/updateAction.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/updateAction.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/parts/updateAction.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -1,9 +1,6 @@
public function executeUpdate(sfWebRequest $request)
{
- $this-><?php echo $this->getSingularName() ?> =
$this->getRoute()->getObject();
- if($request->getParameter('culture')) {
- $this-><?php echo $this->getSingularName()
?>->setLanguage($request->getParameter('culture'));
- }
+ $this-><?php echo $this->getSingularName() ?> = $this->getObject($request);
$this->form = $this->configuration->getForm($this-><?php echo
$this->getSingularName() ?>);
$this->processForm($request, $this->form);
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/template/templates/_form.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/template/templates/_form.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/data/generator/sfDoctrineModule/javascript/template/templates/_form.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -11,7 +11,7 @@
[?php echo $form->renderGlobalErrors() ?]
[?php endif; ?]
- [?php foreach ($configuration->getFormFields($form, $form->isNew() ? 'new'
: 'edit') as $fieldset => $fields): ?]
+ [?php foreach ($configuration->getFormFields($form, $form->isNew() ? 'new'
: 'edit', $form->hasErrors()) as $fieldset => $fields): ?]
[?php include_partial('<?php echo $this->getModuleName()
?>/form_fieldset', array('<?php echo $this->getSingularName() ?>' => $<?php
echo $this->getSingularName() ?>, 'form' => $form, 'fields' => $fields,
'fieldset' => $fieldset)) ?]
[?php endforeach; ?]
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/ExtendedUrlHelper.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/ExtendedUrlHelper.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/ExtendedUrlHelper.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -12,11 +12,14 @@
$uri = sprintf($format, $routePrefix, $form->getObject()->isNew() ? 'create'
: 'update');
$params['sf_subject'] = $form->getObject();
+
return url_for($uri, $params);
}
function ext_form_tag_for(sfForm $form, $routePrefix, $params = array(),
$attributes = array())
{
+ if(!isset($attributes['id']))
+ $attributes['id'] = 'form';
return $form->renderFormTag(ext_url_for_form($form, $routePrefix, $params),
$attributes);
}
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/JavascriptAdminHelper.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/JavascriptAdminHelper.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/helper/JavascriptAdminHelper.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -29,10 +29,11 @@
}
function form_event_handlers($form) {
include_jquery();
- $command = 'jQuery(document).ready(function () {'."\r\n";
+ $command = 'jQuery(document).ready(function() { formBind(); } );'."\r\n";
+ $command .= 'function formBind() {'."\r\n";
$command .= _process_form($form);
$command .= ' reset_function();'."\r\n";
- $command .= '});'."\r\n";
+ $command .= '};'."\r\n";
$command .= _form_hide_fields_function();
$command .= _form_show_labels_function();
$command .= _form_reset_function();
Modified:
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/widget/sfWidgetFormjQueryDatePicker.class.php
===================================================================
---
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/widget/sfWidgetFormjQueryDatePicker.class.php
2010-03-25 14:48:52 UTC (rev 28786)
+++
plugins/sfjQueryDoctrineAdminPlugin/tag/0.1/lib/widget/sfWidgetFormjQueryDatePicker.class.php
2010-03-25 14:53:45 UTC (rev 28787)
@@ -32,6 +32,7 @@
$this->addOption('config', '{}');
$this->addOption('culture', '');
$this->addOption('date_widget', new sfWidgetFormDate());
+ $this->getJavaScripts();
parent::configure($options, $attributes);
@@ -69,7 +70,7 @@
}
$_output .= '<div
id="'.$prefix.'_widget_div">'.$this->getOption('date_widget')->render($name,
$value, $attributes, $errors).'</div>';
$_output .= '<div id="'.$prefix.'_ui_div" style="display: none;">';
- $_output .= tag('input', array('type' => 'hidden', 'disabled' =>
'disabled', 'id' => $prefix.'_temp'));
+ $_output .= tag('input', array('type' => 'text', 'disabled' => 'disabled',
'id' => $prefix.'_temp'));
$_output .= content_tag('div', '', array('id' =>
$prefix.'_div_datepicker'));
$_output .= javascript_tag($this->jsOnSelect($prefix));
$_output .= javascript_tag('jQuery(document).ready(
@@ -176,4 +177,14 @@
}', $name, $name.'_year', $name.'_month', $name.'_day', $name,
$name.'_temp');
}
+ public function getJavaScripts() {
+ $array = parent::getJavaScripts();
+ $array[] = 'jquery.ui.datepicker.min.js';
+ return $array;
+ }
+ public function getStylesheets() {
+ $array = parent::getStylesheets();
+ $array['ui-lightness/jquery-ui-1.7.2.custom.css'] = 'screen';
+ return $array;
+ }
}
--
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.
