Author: ornicar2
Date: 2010-01-19 02:25:33 +0100 (Tue, 19 Jan 2010)
New Revision: 26860
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
Log:
[Diem]
- widget edition handles better widgets which module/action does no more exist
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-19 00:45:01 UTC (rev 26859)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-19 01:25:33 UTC (rev 26860)
@@ -53,14 +53,23 @@
$widgetArray = $widget->toArrayWithMappedValue();
- $widgetRenderer = $this->getServiceContainer()
- ->setParameter('widget_renderer.widget', $widgetArray)
- ->getService('widget_renderer');
+ try
+ {
+ $widgetRenderer = $this->getServiceContainer()
+ ->setParameter('widget_renderer.widget', $widgetArray)
+ ->getService('widget_renderer');
+ $js = $widgetRenderer->getJavascripts();
+ $css = $widgetRenderer->getStylesheets();
+ }
+ catch(Exception $e)
+ {
+ $js = $css = array();
+ }
return $this->renderAsync(array(
'html' => $this->renderEdit(new $formClass($widget),
$widgetType).dmString::ENCODING_SEPARATOR.$this->getService('page_helper')->renderWidget($widgetArray),
- 'js' => $widgetRenderer->getJavascripts(),
- 'css' => $widgetRenderer->getStylesheets()
+ 'js' => $js,
+ 'css' => $css
), true);
}
@@ -73,14 +82,12 @@
protected function renderError()
{
- return $this->renderJson(array(
- 'type' => 'error',
- 'html' => sprintf('<p class="s16 s16_error">%s</p><div class="clearfix
mt30"><a class="dm cancel close_dialog button mr10">%s</a><a class="dm delete
button red" title="%s">%s</a></div>',
+ return $this->renderText(sprintf('<p class="s16 s16_error">%s</p><div
class="clearfix mt30"><a class="dm cancel close_dialog button mr10">%s</a><a
class="dm delete button red" title="%s">%s</a></div>',
$this->getService('i18n')->__('The widget can not be rendered because
its type does not exist anymore.'),
$this->getService('i18n')->__('Cancel'),
$this->getService('i18n')->__('Delete this widget'),
$this->getService('i18n')->__('Delete')
- )));
+ ));
}
protected function renderEdit(dmWidgetBaseForm $form, dmWidgetType
$widgetType)
@@ -147,14 +154,23 @@
$widgetArray = $widget->toArrayWithMappedValue();
- $widgetRenderer = $this->getServiceContainer()
- ->setParameter('widget_renderer.widget', $widgetArray)
- ->getService('widget_renderer');
+ try
+ {
+ $widgetRenderer = $this->getServiceContainer()
+ ->setParameter('widget_renderer.widget', $widgetArray)
+ ->getService('widget_renderer');
+ $js = $widgetRenderer->getJavascripts();
+ $css = $widgetRenderer->getStylesheets();
+ }
+ catch(Exception $e)
+ {
+ $js = $css = array();
+ }
return $this->renderAsync(array(
'html' => $this->getService('page_helper')->renderWidget($widgetArray),
- 'css' => $widgetRenderer->getStylesheets(),
- 'js' => $widgetRenderer->getJavascripts()
+ 'css' => $js,
+ 'js' => $css
), true);
}
--
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.
