Author: Jonathan.Wage
Date: 2010-02-10 23:42:33 +0100 (Wed, 10 Feb 2010)
New Revision: 27865
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalDataGridPlugin/lib/sfSympalDataGrid.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
Log:
[1.4][sfSympalPlugin][1.0] Fixing tests
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalDataGridPlugin/lib/sfSympalDataGrid.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalDataGridPlugin/lib/sfSympalDataGrid.class.php
2010-02-10 22:34:35 UTC (rev 27864)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalDataGridPlugin/lib/sfSympalDataGrid.class.php
2010-02-10 22:42:33 UTC (rev 27865)
@@ -401,7 +401,12 @@
}
}
}
- return isset($current[$column['fieldName']]) ?
$current[$column['fieldName']] : null;
+
+ try {
+ return $current[$column['fieldName']];
+ } catch (Doctrine_Record_UnknownPropertyException $e) {
+ return null;
+ }
}
public function getSymfonyResource($module, $action = null, $variables =
array())
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-02-10 22:34:35 UTC (rev 27864)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-02-10 22:42:33 UTC (rev 27865)
@@ -467,13 +467,16 @@
{
if (!isset($options['class']))
{
- $options['class'] = '';
+ $class = '';
+ } else {
+ $class = $options['class'];
}
- $options['class'] .= ' current';
+ $class .= ' current';
if ($currentAncestor)
{
- $options['class'] .= ' current_ancestor';
+ $class .= ' current_ancestor';
}
+ $options['class'] = $class;
}
$html = link_to($this->renderLabel(), $this->getRoute(), $options);
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-10 22:34:35 UTC (rev 27864)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-10 22:42:33 UTC (rev 27865)
@@ -1,11 +1,9 @@
all:
sympal_config:
language_codes:
- - zh
- - cs
- - da
- en
- - de
+ - fr
+ - es
breadcrumbs_separator: ' / '
plugin_api:
username: test
--
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.
