Author: ornicar2
Date: 2010-02-08 11:18:07 +0100 (Mon, 08 Feb 2010)
New Revision: 27710
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
Log:
[Diem]
- applied main/login -> main/signin convention change to PluginDmPageTable
- fixed possible issue when a page view is created
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
2010-02-08 10:16:35 UTC (rev 27709)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/dmWidgetType/dmWidgetTypeManager.php
2010-02-08 10:18:07 UTC (rev 27710)
@@ -96,6 +96,7 @@
$cache->set('types', $this->widgetTypes);
}
}
+
return $this->widgetTypes;
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
2010-02-08 10:16:35 UTC (rev 27709)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
2010-02-08 10:18:07 UTC (rev 27710)
@@ -9,7 +9,7 @@
/**
* Check that basic pages exist
- * ( main/root, main/error404, main/login )
+ * ( main/root, main/error404, main/signin )
* and, if they don't, will create them
*/
public function checkBasicPages()
@@ -54,15 +54,15 @@
)->save();
}
- // check login page
- if (!$this->createQuery('p')->where('p.module = ? AND p.action = ?',
array('main', 'login'))->exists())
+ // check signin page
+ if (!$this->createQuery('p')->where('p.module = ? AND p.action = ?',
array('main', 'signin'))->exists())
{
$this->create(array(
'module' => 'main',
- 'action' => 'login',
- 'name' => $this->getService('i18n')->__('Login'),
- 'title' => $this->getService('i18n')->__('Login'),
- 'slug' => 'login'
+ 'action' => 'signin',
+ 'name' => $this->getService('i18n')->__('Signin'),
+ 'title' => $this->getService('i18n')->__('Signin'),
+ 'slug' => 'signin'
))->getNode()->insertAsLastChildOf($root);
}
}
@@ -260,11 +260,11 @@
return $this->findOneByModuleAndActionWithI18n('main', 'error404');
}
- public function fetchLogin()
+ public function fetchSignin()
{
$this->checkBasicPages();
- return $this->findOneByModuleAndActionWithI18n('main', 'login');
+ return $this->findOneByModuleAndActionWithI18n('main', 'signin');
}
public function findOneByIdWithI18n($id, $culture = null)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
2010-02-08 10:16:35 UTC (rev 27709)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
2010-02-08 10:18:07 UTC (rev 27710)
@@ -17,7 +17,7 @@
*/
public function createFromModuleAndAction($module, $action)
{
- $pageView = dmDb::create('DmPageView', array(
+ return dmDb::create('DmPageView', array(
'module' => $module,
'action' => $action,
'dm_layout_id' => dmDb::table('DmLayout')->findFirstOrCreate()
--
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.
