Author: ornicar2
Date: 2010-01-20 01:18:10 +0100 (Wed, 20 Jan 2010)
New Revision: 26905
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/filter/dmAdminInitFilter.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/lib/dmRememberMeFilter.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
Log:
[Diem]
- fixed edition assets loading when user connected with remember_me filter
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/filter/dmAdminInitFilter.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/filter/dmAdminInitFilter.php
2010-01-20 00:02:57 UTC (rev 26904)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/filter/dmAdminInitFilter.php
2010-01-20 00:18:10 UTC (rev 26905)
@@ -14,6 +14,8 @@
$this->saveApplicationUrl();
+ $this->loadAssetConfig();
+
$filterChain->execute();
$response = $this->context->getResponse();
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
2010-01-20 00:02:57 UTC (rev 26904)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
2010-01-20 00:18:10 UTC (rev 26905)
@@ -2,6 +2,14 @@
abstract class dmInitFilter extends dmFilter
{
+
+ protected function loadAssetConfig()
+ {
+ if ($this->context->getResponse()->isHtmlForHuman())
+ {
+
$this->context->getResponse()->setAssetConfig($this->context->get('asset_config'));
+ }
+ }
protected function checkFilesystemPermissions()
{
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-01-20 00:02:57 UTC (rev 26904)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-01-20 00:18:10 UTC (rev 26905)
@@ -52,12 +52,8 @@
protected function configureResponse()
{
- $response = $this->getService('response');
-
- if ($response->isHtmlForHuman())
+ if ($this->getService('response')->isHtmlForHuman())
{
- $response->setAssetConfig($this->getService('asset_config'));
-
$userCanCodeEditor = $this->getService('user')->can('code_editor');
$this->getService('stylesheet_compressor')->setOption('protect_user_assets',
$userCanCodeEditor);
@@ -195,8 +191,7 @@
return $this;
}
-
-
+
public function reload($id)
{
if (!$this->hasService($id))
@@ -212,7 +207,6 @@
return $this;
}
-
/**
* Sets a service container parameter.
*
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/lib/dmRememberMeFilter.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/lib/dmRememberMeFilter.class.php
2010-01-20 00:02:57 UTC (rev 26904)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/lib/dmRememberMeFilter.class.php
2010-01-20 00:18:10 UTC (rev 26905)
@@ -24,7 +24,7 @@
* @author Fabien Potencier <[email protected]>
* @version SVN: $Id: sfGuardRememberMeFilter.class.php 23170 2009-10-18
17:30:33Z FabianLange $
*/
-class dmRememberMeFilter extends sfFilter
+class dmRememberMeFilter extends dmFilter
{
/**
* Executes the filter chain.
@@ -40,7 +40,7 @@
&&
$this->context->getUser()->isAnonymous()
&&
- $cookie = $this->context->getRequest()->getCookie($cookieName)
+ $cookie = $this->request->getCookie($cookieName)
)
{
$q = Doctrine_Core::getTable('DmRememberKey')->createQuery('r')
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
2010-01-20 00:02:57 UTC (rev 26904)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
2010-01-20 00:18:10 UTC (rev 26905)
@@ -15,6 +15,8 @@
$this->saveApplicationUrl();
+ $this->loadAssetConfig();
+
// ajax calls use dm_cpi or page_id request parameter to set a page
if($pageId = $this->request->getParameter('dm_cpi',
$this->request->getParameter('page_id')))
{
--
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.
