Author: allyb
Date: 2010-02-18 22:59:47 +0100 (Thu, 18 Feb 2010)
New Revision: 28129
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/config/doctrine/schema.yml
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml.propel
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/ORM
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/sfEasyAuthRouting.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/task/sfEasyAuthCreateUserTask.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml
Log:
Updated some references to propel
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/ORM
===================================================================
--- plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/ORM
2010-02-18 21:32:29 UTC (rev 28128)
+++ plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/ORM
2010-02-18 21:59:47 UTC (rev 28129)
@@ -8,8 +8,8 @@
* To use the Propel version, execute:
- find . -name '*.php' | xargs perl -i -pe
's/\...@#(.*?)###(.*?)#...@#/$1/g;'
+ find . -name '*.php' | xargs perl -i -pe 's!\S*/\*&(.*?)###(.*?)&\*/!$1!g;'
* To use the Doctrine version, run:
- find . -name '*.php' | xargs perl -i -pe
's/\...@#(.*?)###(.*?)#...@#/$2/g;'
\ No newline at end of file
+ find . -name '*.php' | xargs perl -i -pe 's!\S*/\*&(.*?)###(.*?)&\*/!$2!g;'
\ No newline at end of file
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/config/doctrine/schema.yml
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/config/doctrine/schema.yml
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/config/doctrine/schema.yml
2010-02-18 21:59:47 UTC (rev 28129)
@@ -0,0 +1,30 @@
+sfEasyAuthUser:
+ actAs:
+ Timestampable: ~
+ columns:
+ username: { type: string(255), notnull: true }
+ password: { type: string(32), notnull: true }
+ email: { type: string(255), notnull: true }
+ email_confirmed: { type: boolean, default: 0 }
+ salt: { type: string(32), notnull: true }
+ last_login: { type: timestamp }
+ last_login_attempt: { type: timestamp }
+ failed_logins: { type: integer, default: 0 }
+ locked_by_admins: { type: boolean, default: 0 }
+ auto_login_hash: { type: string(32) }
+ password_reset_token: { type: string(12) }
+ password_reset_token_created_at: { type: timestamp }
+ indexes:
+ username: { fields: [ username ], type: unique }
+ email: { fields: [ email ], type: unique }
+
+sfEasyAuthUserCredential:
+ columns:
+ user_id: { type: integer, primary: true }
+ credential: { type: string(60), primary: true }
+ profile_id: { type: integer, default: null }
+ relations:
+ sfEasyAuthUser: { local: user_id, foreign: id, onDelete: CASCADE }
+ indexes:
+ user_id: { fields: [ user_id ] }
+ profile_id: { fields: [ profile_id ] }
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
2010-02-18 21:32:29 UTC (rev 28128)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
2010-02-18 21:59:47 UTC (rev 28129)
@@ -15,19 +15,25 @@
{
$form->useFields(array('username', 'email', 'locked_by_admins'));
- $credentials = array_merge(array('' => 'Any'),
sfEasyAuthUserCredentialPeer::getAllCredentialsAsArray());
+ $credentials = array_merge(
+ array('' => 'Any'),
+
sfEasyAuthUserCredentialTable/*&sfEasyAuthUserCredentialPeer###sfEasyAuthUserCredentialTable&*/::getAllCredentialsAsArray());
- $form->widgetSchema['credential'] = new sfWidgetFormChoice(
- array(
- 'choices' => $credentials,
- 'expanded' => false
+ $form->setWidget('credential',
+ new sfWidgetFormChoice(
+ array(
+ 'choices' => $credentials,
+ 'expanded' => false
+ )
)
);
- $form->validatorSchema['credential'] = new sfValidatorChoice(
- array(
- 'choices' => $credentials,
- 'required' => false
+ $form->setValidator('credential',
+ new sfValidatorChoice(
+ array(
+ 'choices' => $credentials,
+ 'required' => false
+ )
)
);
}
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/sfEasyAuthRouting.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/sfEasyAuthRouting.class.php
2010-02-18 21:32:29 UTC (rev 28128)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/sfEasyAuthRouting.class.php
2010-02-18 21:59:47 UTC (rev 28129)
@@ -78,13 +78,17 @@
static public function addRouteForAdminUser(sfEvent $event)
{
- $event->getSubject()->prependRoute('sf_easy_auth_user', new
sfPropelRouteCollection(array(
- 'name' => 'sf_easy_auth_user',
- 'model' => 'sfEasyAuthUser',
- 'module' => 'sfEasyAuthUser',
- 'prefix_path' => 'sf_easy_auth_user',
- 'with_wildcard_routes' => true,
- 'requirements' => array(),
- )));
+ $event->getSubject()->prependRoute('sf_easy_auth_user',
+ new
sfDoctrineRouteCollection/*&sfPropelRouteCollection###sfDoctrineRouteCollection&*/(
+ array(
+ 'name' => 'sf_easy_auth_user',
+ 'model' => 'sfEasyAuthUser',
+ 'module' => 'sfEasyAuthUser',
+ 'prefix_path' => 'sf_easy_auth_user',
+ 'with_wildcard_routes' => true,
+ 'requirements' => array(),
+ )
+ )
+ );
}
}
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/task/sfEasyAuthCreateUserTask.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/task/sfEasyAuthCreateUserTask.class.php
2010-02-18 21:32:29 UTC (rev 28128)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/task/sfEasyAuthCreateUserTask.class.php
2010-02-18 21:59:47 UTC (rev 28129)
@@ -12,7 +12,7 @@
* @author Fabien Potencier <[email protected]>
* @version SVN: $Id: sfGuardCreateUserTask.class.php 13761 2008-12-05
10:14:51Z fabien $
*/
-class sfEasyAuthCreateUserTask extends
sfdoctrinebaseta...@#sfpropelbasetask###sfdoctrinebasetask#@#
+class sfEasyAuthCreateUserTask extends
sfDoctrineBaseTask/*&sfPropelBaseTask###sfDoctrineBaseTask&*/
{
/**
* @see sfTask
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml
2010-02-18 21:32:29 UTC (rev 28128)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml
2010-02-18 21:59:47 UTC (rev 28129)
@@ -1,5 +1,5 @@
generator:
- class: sfPropelGenerator
+ class: sfDoctrineGenerator
param:
model_class: sfEasyAuthUser
theme: admin
@@ -8,7 +8,8 @@
singular: ~
plural: ~
route_prefix: sf_easy_auth_user
- with_propel_route: 1
+ with_doctrine_route: true
+ actions_base_class: sfActions
config:
fields:
Copied:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml.propel
(from rev 28119,
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml)
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml.propel
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml.propel
2010-02-18 21:59:47 UTC (rev 28129)
@@ -0,0 +1,32 @@
+generator:
+ class: sfPropelGenerator
+ param:
+ model_class: sfEasyAuthUser
+ theme: admin
+ non_verbose_templates: true
+ with_show: false
+ singular: ~
+ plural: ~
+ route_prefix: sf_easy_auth_user
+ with_propel_route: 1
+
+ config:
+ fields:
+ password: { label: New password }
+ account_temporarily_locked: { label: Temporarily locked, type: boolean
}
+ credentials_as_string: { label: Credentials }
+ sb_user_mailing_list_list: { label: Mailing lists }
+ sb_user_marketing_question_list: { label: Marketing questions }
+ email: { label: Email address }
+ list:
+ sort: [ username, asc ]
+ title: User list
+ display: [=username, credentials_as_string, created_at, last_login,
locked_by_admins, account_temporarily_locked ]
+ filter: ~
+ form:
+ display: [ username, password, email, email_confirmed, last_login,
last_login_attempt, failed_logins, locked_by_admins, type, credentials ]
+ edit:
+ title: Editing User "%%username%%"
+ new:
+ title: New User
+ display: [ username, password, enabled, type ]
\ No newline at end of file
Property changes on:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/modules/sfEasyAuthUser/config/generator.yml.propel
___________________________________________________________________
Added: svn:mergeinfo
+
--
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.
