Author: ornicar2
Date: 2010-01-21 19:14:08 +0100 (Thu, 21 Jan 2010)
New Revision: 27013
Added:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectUserTest.php
Removed:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/dmAdminWebResponse.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/dmFrontWebResponse.php
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/config/factories.yml
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmBrowserChart.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/admin/config/factories.yml
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/front/config/factories.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/controller/dmFrontWebController.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/factories.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/factories.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmGroupPermission.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserGroup.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserPermission.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
plugins/diemPlugin/trunk/dmFrontPlugin/config/factories.yml
plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
Log:
[Diem]
- removed deprecated dmFrontWebResponse and dmAdminWebResponse classes
- fixed skeleton default factories.yml
- fixed browser and log charts cache usage
- added writer user to test project
- fixed internal use of user->can()
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/config/factories.yml
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/config/factories.yml 2010-01-21
17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/config/factories.yml 2010-01-21
18:14:08 UTC (rev 27013)
@@ -36,7 +36,7 @@
class: dmFrontWebController
response:
- class: dmAdminWebResponse
+ class: dmWebResponse
logger:
param:
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmBrowserChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmBrowserChart.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmBrowserChart.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -54,7 +54,7 @@
protected function getData()
{
- if (true || !$data = $this->getCache('data'))
+ if (!$data = $this->getCache('data'))
{
$months = 1;
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -97,7 +97,7 @@
protected function getData()
{
- if (true || !$data = $this->getCache('data'))
+ if (!$data = $this->getCache('data'))
{
$data = array(
'date' => array(),
Deleted:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/dmAdminWebResponse.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/dmAdminWebResponse.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/dmAdminWebResponse.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -1,6 +0,0 @@
-<?php
-
-class dmAdminWebResponse extends dmWebResponse
-{
-
-}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/admin/config/factories.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/admin/config/factories.yml
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/admin/config/factories.yml
2010-01-21 18:14:08 UTC (rev 27013)
@@ -20,7 +20,6 @@
session_path: %SF_TEST_CACHE_DIR%/sessions
response:
- class: dmAdminWebResponse
param:
send_http_headers: false
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/front/config/factories.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/front/config/factories.yml
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/apps/front/config/factories.yml
2010-01-21 18:14:08 UTC (rev 27013)
@@ -20,7 +20,6 @@
session_path: %SF_TEST_CACHE_DIR%/sessions
response:
- class: dmFrontWebResponse
param:
send_http_headers: false
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/controller/dmFrontWebController.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/controller/dmFrontWebController.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/controller/dmFrontWebController.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -2,13 +2,8 @@
class dmFrontWebController extends sfFrontWebController
{
- /**
- * Redirects the request to another URL.
- *
- * @param string $url An existing URL
- * @param int $delay A delay in seconds before redirecting. This is
only needed on
- * browsers that do not support HTTP headers
- * @param int $statusCode The status code
+ /*
+ * @see sfFrontWebController
*/
public function redirect($url, $delay = 0, $statusCode = 302)
{
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -1,6 +1,6 @@
<?php
-abstract class dmWebResponse extends sfWebResponse
+class dmWebResponse extends sfWebResponse
{
protected
$isHtmlForHuman = true,
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/factories.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/factories.yml
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/factories.yml
2010-01-21 18:14:08 UTC (rev 27013)
@@ -20,7 +20,6 @@
session_path: %SF_TEST_CACHE_DIR%/sessions
response:
- class: dmAdminWebResponse
param:
send_http_headers: false
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/factories.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/factories.yml
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/factories.yml
2010-01-21 18:14:08 UTC (rev 27013)
@@ -20,7 +20,6 @@
session_path: %SF_TEST_CACHE_DIR%/sessions
response:
- class: dmFrontWebResponse
param:
send_http_headers: false
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -32,6 +32,7 @@
$this->pluginConfigurations['dmAlternativeHelperPlugin']->connectTests();
$this->pluginConfigurations['dmFlowPlayerPlugin']->connectTests();
$this->pluginConfigurations['dmContactPlugin']->connectTests();
+ $this->pluginConfigurations['dmUserPlugin']->connectTests();
}
public function listenToSetupAfterEvent(sfEvent $event)
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmGroupPermission.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmGroupPermission.class.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmGroupPermission.class.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -56,8 +56,5 @@
'local' => 'dm_permission_id',
'foreign' => 'id',
'onDelete' => 'CASCADE'));
-
- $timestampable0 = new Doctrine_Template_Timestampable();
- $this->actAs($timestampable0);
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -55,8 +55,5 @@
'local' => 'dm_user_id',
'foreign' => 'id',
'onDelete' => 'CASCADE'));
-
- $timestampable0 = new Doctrine_Template_Timestampable();
- $this->actAs($timestampable0);
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserGroup.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserGroup.class.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserGroup.class.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -56,8 +56,5 @@
'local' => 'dm_group_id',
'foreign' => 'id',
'onDelete' => 'CASCADE'));
-
- $timestampable0 = new Doctrine_Template_Timestampable();
- $this->actAs($timestampable0);
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserPermission.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserPermission.class.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmUserPermission.class.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -56,8 +56,5 @@
'local' => 'dm_permission_id',
'foreign' => 'id',
'onDelete' => 'CASCADE'));
-
- $timestampable0 = new Doctrine_Template_Timestampable();
- $this->actAs($timestampable0);
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -34,8 +34,26 @@
$this->addH1();
$this->addManualPages();
+
+ $this->addUsers();
}
+ protected function addUsers()
+ {
+ $writer = dmDb::table('DmUser')->create(array(
+ 'username' => 'writer',
+ 'email' => 'writer.org',
+ 'is_active' => true,
+ 'is_super_admin' => false
+ ));
+
+ $writer->setPassword('writer');
+
+ $writer->addGroupByName('writer');
+
+ $writer->save();
+ }
+
/*
* root
* page1
Added:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectUserTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectUserTest.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectUserTest.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -0,0 +1,28 @@
+<?php
+
+require_once(realpath(dirname(__FILE__).'/../../..').'/unit/helper/dmUnitTestHelper.php');
+$helper = new dmUnitTestHelper();
+$helper->boot('admin');
+
+$t = new lime_test(7);
+
+$user = $helper->get('user');
+
+$guardUser = dmDb::table('DmUser')->findOneByUsername('writer');
+
+$t->comment('Signin as writer');
+$user->signIn($guardUser);
+
+$t->ok($user->can('admin'), 'user can admin');
+
+$t->ok($user->can('content'), 'useer can content');
+
+$t->ok(!$user->can('system'), 'user can not system');
+
+$t->ok(!$user->can('zone_add'), 'user can not zone_add');
+
+$t->ok($user->can('admin, content'), 'user can admin, content');
+
+$t->ok($user->can('admin, system'), 'user can not admin, system');
+
+$t->ok(!$user->can('system, zone_add'), 'user can not system, zone_add');
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/config/factories.yml
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/config/factories.yml 2010-01-21
17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/config/factories.yml 2010-01-21
18:14:08 UTC (rev 27013)
@@ -36,7 +36,7 @@
class: dmFrontWebController
response:
- class: dmFrontWebResponse
+ class: dmWebResponse
logger:
param:
Deleted:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/dmFrontWebResponse.php
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/dmFrontWebResponse.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/dmFrontWebResponse.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -1,28 +0,0 @@
-<?php
-
-class dmFrontWebResponse extends dmWebResponse
-{
- protected
- $preserveThemeStylesheets,
- $themeCssWebPath;
-
- protected function getCachedStylesheets()
- {
- if($this->preserveThemeStylesheets = dm::getUser()->can('code_editor'))
- {
- $this->themeCssWebPath = dm::getUser()->getTheme()->getPath('css');
- }
-
- return parent::getCachedStylesheets();
- }
-
- protected function isStylesheetCachable($stylesheet)
- {
- if (!$this->preserveThemeStylesheets)
- {
- return true;
- }
-
- return strpos($stylesheet, $this->themeCssWebPath) !== 0;
- }
-}
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
2010-01-21 17:27:32 UTC (rev 27012)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -63,7 +63,7 @@
public function getIsEditMode()
{
- return $this->can('zone_add widget_add') &&
$this->getAttribute('dm_front_edit');
+ return $this->can('zone_add, widget_add') &&
$this->getAttribute('dm_front_edit');
}
public function setIsEditMode($value)
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-21 17:27:32 UTC (rev 27012)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-21 18:14:08 UTC (rev 27013)
@@ -38,7 +38,7 @@
echo
£link('+/dmPage/new')->set('a.page_add_form.widget24.s24block.s24_page_add')->textTitle(__('Add
new page'));
}
- if ($sf_user->can('zone_add widget_add'))
+ if ($sf_user->can('zone_add, widget_add'))
{
echo
£('a.edit_toggle.widget24.s24block.s24_view_'.($sf_user->getIsEditMode() ? 'on'
: 'off'), array('title' => __('Show page structure')),
__('Add')
--
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.
