Author: ornicar2
Date: 2010-02-08 11:09:04 +0100 (Mon, 08 Feb 2010)
New Revision: 27704
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/dmUser/
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/templates/_loginForm.php
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/dm/config.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/settings.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/actions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/components.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/dm/modules.yml
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/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
Log:
[Diem]
- updated test project for new theming syntax
- added user pages to test project
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
2010-02-08 10:09:04 UTC (rev 27704)
@@ -33,8 +33,8 @@
use_database: true
.actions:
- secure_module: dmAuthAdmin
+ secure_module: dmUserAdmin
secure_action: secure
- login_module: dmAuthAdmin
+ login_module: dmUserAdmin
login_action: signin
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/dm/config.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/dm/config.yml
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/dm/config.yml
2010-02-08 10:09:04 UTC (rev 27704)
@@ -1,12 +1,17 @@
all:
- theme: # front css themes
- list: # list of themes
- theme:
- name: Theme # theme name
- path: theme # theme path from web dir
- enabled: true # theme disponibility from
dmThemeManager
- default: theme # default theme when user
arrive on site
+ theming:
+ themes: # list of themes
+ "First Theme":
+ dir: theme # theme path from web dir
+ enabled: false # theme disponibility from
dmThemeManager
+ "Fancy Theme":
+ # testing BC compatibility path=dir
+ path: fancyTheme
+ # testing enabled defaults to true
+ "Another Theme":
+ dir: anotherTheme
+ enabled: true
html:
doctype:
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/settings.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/settings.yml
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/config/settings.yml
2010-02-08 10:09:04 UTC (rev 27704)
@@ -35,11 +35,11 @@
.actions:
- secure_module: dmFront
+ secure_module: dmUser
secure_action: secure
- login_module: dmFront
- login_action: login
+ login_module: dmUser
+ login_action: signin
error_404_module: dmFront # To be called when a 404 error is raised
error_404_action: error404 # Or when the requested URL doesn't
match any route
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/actions.class.php
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/actions.class.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -5,24 +5,6 @@
class mainActions extends myFrontModuleActions
{
- public function executeLoginFormWidget(dmWebRequest $request)
- {
- $user = $this->getUser();
- // by assigning the form to $this->forms,
- // we allow the loginForm component to access it
- $form = $this->forms['dmFormSignin'];
- if ($request->isMethod('post'))
- {
- if ($form->bindAndValid($request))
- {
- $this->getUser()->signin($form->getValue('user'),
$form->getValue('remember', false));
-
- return $this->redirect($request->getReferer());
- }
- }
- }
-
-
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/components.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/components.class.php
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/actions/components.class.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -18,11 +18,6 @@
// Your code here
}
- public function executeLoginForm()
- {
- $this->form = $this->forms['dmFormSignin'];
- }
-
public function executeSitemap()
{
$this->menu = $this->getService('sitemap_menu')->build();
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/templates/_loginForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/templates/_loginForm.php
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/main/templates/_loginForm.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -1,18 +0,0 @@
-<?php
-// Main : Login form
-
-echo $form->open();
-
-echo _tag('ul',
-
- _tag('li', $form['username']->label()->field()->error()).
-
- _tag('li', $form['password']->label()->field()->error()).
-
- _tag('li', $form['remember']->label()->field()->error())
-
-);
-
-echo $form->renderHiddenFields().$form->submit('Login');
-
-echo $form->close();
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/dm/modules.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/dm/modules.yml
2010-02-08 10:07:56 UTC (rev 27703)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/dm/modules.yml
2010-02-08 10:09:04 UTC (rev 27704)
@@ -6,7 +6,6 @@
components:
header:
footer:
- loginForm:
sitemap:
Food:
@@ -67,13 +66,9 @@
Author:
- author:
- model: DmUser
- front: false
-
dmUser:
name: Author
page: true
components:
- list: { cache: true }
- show: { cache: true }
\ No newline at end of file
+ list:
+ show:
\ No newline at end of file
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/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
2010-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -26,7 +26,6 @@
'dimensions' => new sfWidgetFormInputText(),
'created_at' => new sfWidgetFormDateTime(),
'updated_at' => new sfWidgetFormDateTime(),
- 'dm_test_post_list' => new sfWidgetFormDoctrineChoice(array('multiple'
=> true, 'model' => 'DmTestPost')),
));
$this->setValidators(array(
@@ -41,7 +40,6 @@
'dimensions' => new sfValidatorString(array('max_length' => 15,
'required' => false)),
'created_at' => new sfValidatorDateTime(),
'updated_at' => new sfValidatorDateTime(),
- 'dm_test_post_list' => new sfValidatorDoctrineChoice(array('multiple'
=> true, 'model' => 'DmTestPost', 'required' => false)),
));
$this->validatorSchema->setPostValidator(
@@ -62,60 +60,4 @@
return 'DmMedia';
}
- public function updateDefaultsFromObject()
- {
- parent::updateDefaultsFromObject();
-
- if (isset($this->widgetSchema['dm_test_post_list']))
- {
- $this->setDefault('dm_test_post_list',
$this->object->DmTestPost->getPrimaryKeys());
- }
-
- }
-
- protected function doSave($con = null)
- {
- $this->saveDmTestPostList($con);
-
- parent::doSave($con);
- }
-
- public function saveDmTestPostList($con = null)
- {
- if (!$this->isValid())
- {
- throw $this->getErrorSchema();
- }
-
- if (!isset($this->widgetSchema['dm_test_post_list']))
- {
- // somebody has unset this widget
- return;
- }
-
- if (null === $con)
- {
- $con = $this->getConnection();
- }
-
- $existing = $this->object->DmTestPost->getPrimaryKeys();
- $values = $this->getValue('dm_test_post_list');
- if (!is_array($values))
- {
- $values = array();
- }
-
- $unlink = array_diff($existing, $values);
- if (count($unlink))
- {
- $this->object->unlink('DmTestPost', array_values($unlink));
- }
-
- $link = array_diff($values, $existing);
- if (count($link))
- {
- $this->object->link('DmTestPost', array_values($link));
- }
- }
-
}
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-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/model/doctrine/dmUserPlugin/base/BaseDmRememberKey.class.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -55,5 +55,13 @@
'local' => 'dm_user_id',
'foreign' => 'id',
'onDelete' => 'CASCADE'));
+
+ $timestampable0 = new Doctrine_Template_Timestampable(array(
+ 'updated' =>
+ array(
+ 'disabled' => true,
+ ),
+ ));
+ $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-02-08 10:07:56 UTC (rev 27703)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/myTestProjectBuilder.php
2010-02-08 10:09:04 UTC (rev 27704)
@@ -23,7 +23,7 @@
$this->changeHomeLayout();
- $this->addLoginForm();
+ $this->addSigninForm();
$this->addBreadCrumb();
@@ -342,6 +342,28 @@
array(),
$page->PageView->Area->Zones[0]
)->save();
+
+ // user list
+ $this->createWidget(
+ 'dmUser/list',
+ array(
+ 'orderField' => 'created_at',
+ 'orderType' => 'asc',
+ 'maxPerPage' => 0,
+ 'navTop' => true,
+ 'navBottom' => true
+ ),
+ dmDb::table('DmPage')->findOneByModuleAndAction('dmUser',
'list')->PageView->Area->Zones[0]
+ )->save();
+
+ $this->context->setPage($page =
dmDb::table('DmPage')->findOneByModuleAndAction('dmUser', 'show'));
+
+ // user show
+ $this->createWidget(
+ 'dmUser/show',
+ array(),
+ $page->PageView->Area->Zones[0]
+ )->save();
}
protected function loremize()
@@ -371,7 +393,7 @@
$this->createWidget(
'dmWidgetNavigation/breadCrumb',
array('includeCurrent' => true),
- dmDb::table('DmPage')->findOneByModuleAndAction('main',
'login')->PageView->Layout->getArea('top')->Zones[0]
+ dmDb::table('DmPage')->findOneByModuleAndAction('main',
'signin')->PageView->Layout->getArea('top')->Zones[0]
)->save();
}
@@ -380,7 +402,7 @@
$this->createWidget(
'dmWidgetContent/link',
array('href' => 'page:1'),
- dmDb::table('DmPage')->findOneByModuleAndAction('main',
'login')->PageView->Layout->getArea('top')->Zones[0]
+ dmDb::table('DmPage')->findOneByModuleAndAction('main',
'signin')->PageView->Layout->getArea('top')->Zones[0]
)->save();
$this->createWidget(
@@ -390,13 +412,19 @@
)->save();
}
- protected function addLoginForm()
+ protected function addSigninForm()
{
$this->createWidget(
- 'main/loginForm',
+ 'dmUser/signin',
array(),
- dmDb::table('DmPage')->findOneByModuleAndAction('main',
'login')->PageView->Area->Zones[0]
+ dmDb::table('DmPage')->findOneByModuleAndAction('main',
'signin')->PageView->Area->Zones[0]
)->save();
+
+ $this->createWidget(
+ 'dmUser/form',
+ array(),
+ dmDb::table('DmPage')->findOneByModuleAndAction('main',
'signin')->PageView->Area->Zones[0]
+ )->save();
}
protected function createWidget($moduleAction, array $data, DmZone $zone)
--
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.
