Changeset 1803 for sandboxes

Timestamp:

07/20/10 12:01:58 (19 months ago)

Author:

tboutell

Message:

Comments explaining when and how to modify web/index.php (we at P'unk should leave it alone so
Symfony devs see what they expect; once you've cloned this into your own repo though, go ahead
and change it if you wish).

Separate superadmin and admin test users in the default fixtures (we recommend pulling the
plug on superadmin before you hand the keys to your client)

Location:

sandboxes/asandbox/trunk

Files:

• . (modified) (1 prop)
• apps/frontend/i18n (modified) (1 prop)
• data/fixtures/demo_admin_user.yml (modified) (1 diff)
• lib/model/doctrine/apostrophePlugin/base/BaseaPage.class.php (modified) (8 diffs)
• lib/model/doctrine/apostrophePlugin/base/BaseaSlot.class.php (modified) (2 diffs)
• lib/model/doctrine/sfDoctrineGuardPlugin/base/BasesfGuardUser.class.php (modified) (8 diffs)
• web/index.php (modified) (1 diff)

sandboxes/asandbox/trunk/data/fixtures/demo_admin_user.yml

@@ +1 @@
+# Two users by default: a superadmin (we suggest reserving this account for developer use and
+# removing it at production launch) and an admin (a member of the admin group). We suggest
+# giving the latter account to the client. Out of the box, Apostrophe's group 
+# dashboard isn't of much use to a client admin (it will be in 1.5) and the permissions 
+# dashboard is just plain dangerous, so we show only the users dashboard to regular admins
+
 sfGuardUser:
+  sgu_superadmin:
+    username: superadmin
+    password: demo
+    is_super_admin: true
   sgu_admin:
     username: admin
     password: demo
-    is_super_admin: true
+sfGuardUserGroup:
+  sgug_admin_admin:
+    sfGuardUser: sgu_admin
+    sfGuardGroup: sfGuardGroup_admin

sandboxes/asandbox/trunk/lib/model/doctrine/apostrophePlugin/base/BaseaPage.class.php

@@ -17 +17 @@
  * @property sfGuardUser $Author
  * @property sfGuardUser $Deleter
- * @property Doctrine_Collection $aBlogItem
- * @property Doctrine_Collection $BlogCategories
- * @property Doctrine_Collection $aBlogPageCategory
  * @property Doctrine_Collection $Areas
  * @property Doctrine_Collection $Accesses
@@ -26 +23 @@
  * @property Doctrine_Collection $aMediaPageCategory
  * @property Doctrine_Collection $aRedirect
+ * @property Doctrine_Collection $aBlogItem
+ * @property Doctrine_Collection $BlogCategories
+ * @property Doctrine_Collection $aBlogPageCategory
  * 
  * @method integer             getId()                 Returns the current record's "id" value
@@ -38 +38 @@
  * @method sfGuardUser         getAuthor()             Returns the current record's "Author" value
  * @method sfGuardUser         getDeleter()            Returns the current record's "Deleter" value
- * @method Doctrine_Collection getABlogItem()          Returns the current record's "aBlogItem" collection
- * @method Doctrine_Collection getBlogCategories()     Returns the current record's "BlogCategories" collection
- * @method Doctrine_Collection getABlogPageCategory()  Returns the current record's "aBlogPageCategory" collection
  * @method Doctrine_Collection getAreas()              Returns the current record's "Areas" collection
  * @method Doctrine_Collection getAccesses()           Returns the current record's "Accesses" collection
@@ -47 +44 @@
  * @method Doctrine_Collection getAMediaPageCategory() Returns the current record's "aMediaPageCategory" collection
  * @method Doctrine_Collection getARedirect()          Returns the current record's "aRedirect" collection
+ * @method Doctrine_Collection getABlogItem()          Returns the current record's "aBlogItem" collection
+ * @method Doctrine_Collection getBlogCategories()     Returns the current record's "BlogCategories" collection
+ * @method Doctrine_Collection getABlogPageCategory()  Returns the current record's "aBlogPageCategory" collection
  * @method aPage               setId()                 Sets the current record's "id" value
  * @method aPage               setSlug()               Sets the current record's "slug" value
@@ -58 +58 @@
  * @method aPage               setAuthor()             Sets the current record's "Author" value
  * @method aPage               setDeleter()            Sets the current record's "Deleter" value
- * @method aPage               setABlogItem()          Sets the current record's "aBlogItem" collection
- * @method aPage               setBlogCategories()     Sets the current record's "BlogCategories" collection
- * @method aPage               setABlogPageCategory()  Sets the current record's "aBlogPageCategory" collection
  * @method aPage               setAreas()              Sets the current record's "Areas" collection
  * @method aPage               setAccesses()           Sets the current record's "Accesses" collection
@@ -67 +64 @@
  * @method aPage               setAMediaPageCategory() Sets the current record's "aMediaPageCategory" collection
  * @method aPage               setARedirect()          Sets the current record's "aRedirect" collection
+ * @method aPage               setABlogItem()          Sets the current record's "aBlogItem" collection
+ * @method aPage               setBlogCategories()     Sets the current record's "BlogCategories" collection
+ * @method aPage               setABlogPageCategory()  Sets the current record's "aBlogPageCategory" collection
  * 
  * @package    asandbox
@@ -146 +146 @@
              'foreign' => 'id'));
 
-        $this->hasMany('aBlogItem', array(
-             'local' => 'id',
-             'foreign' => 'page_id'));
-
-        $this->hasMany('aBlogCategory as BlogCategories', array(
-             'refClass' => 'aBlogPageCategory',
-             'local' => 'page_id',
-             'foreign' => 'blog_category_id'));
-
-        $this->hasMany('aBlogPageCategory', array(
-             'local' => 'id',
-             'foreign' => 'page_id'));
-
         $this->hasMany('aArea as Areas', array(
              'local' => 'id',
@@ -184 +171 @@
              'foreign' => 'page_id'));
 
+        $this->hasMany('aBlogItem', array(
+             'local' => 'id',
+             'foreign' => 'page_id'));
+
+        $this->hasMany('aBlogCategory as BlogCategories', array(
+             'refClass' => 'aBlogPageCategory',
+             'local' => 'page_id',
+             'foreign' => 'blog_category_id'));
+
+        $this->hasMany('aBlogPageCategory', array(
+             'local' => 'id',
+             'foreign' => 'page_id'));
+
         $timestampable0 = new Doctrine_Template_Timestampable(array(
              ));

sandboxes/asandbox/trunk/lib/model/doctrine/apostrophePlugin/base/BaseaSlot.class.php

@@ -63 +63 @@
 
         $this->setSubClasses(array(
-             'aBlogSlot' => 
-             array(
-              'type' => 'aBlog',
-             ),
-             'aBlogSingleSlot' => 
-             array(
-              'type' => 'aBlogSingle',
-             ),
-             'aEventSlot' => 
-             array(
-              'type' => 'aEvent',
-             ),
-             'aEventSingleSlot' => 
-             array(
-              'type' => 'aEventSingle',
-             ),
              'aTextSlot' => 
              array(
@@ -123 +107 @@
               'type' => 'aNewRichText',
              ),
+             'aBlogSlot' => 
+             array(
+              'type' => 'aBlog',
+             ),
+             'aBlogSingleSlot' => 
+             array(
+              'type' => 'aBlogSingle',
+             ),
+             'aEventSlot' => 
+             array(
+              'type' => 'aEvent',
+             ),
+             'aEventSingleSlot' => 
+             array(
+              'type' => 'aEventSingle',
+             ),
              ));
     }

sandboxes/asandbox/trunk/lib/model/doctrine/sfDoctrineGuardPlugin/base/BasesfGuardUser.class.php

@@ -16 +16 @@
  * @property Doctrine_Collection $groups
  * @property Doctrine_Collection $permissions
+ * @property Doctrine_Collection $aPage
+ * @property Doctrine_Collection $aAreaVersion
+ * @property Doctrine_Collection $Accesses
+ * @property Doctrine_Collection $MediaItems
  * @property Doctrine_Collection $BlogAuthorItems
  * @property Doctrine_Collection $BlogEditorItems
@@ -21 +25 @@
  * @property Doctrine_Collection $BlogCategories
  * @property Doctrine_Collection $BlogCategoryUsers
- * @property Doctrine_Collection $aPage
- * @property Doctrine_Collection $aAreaVersion
- * @property Doctrine_Collection $Accesses
- * @property Doctrine_Collection $MediaItems
  * @property Doctrine_Collection $sfGuardUserPermission
  * @property Doctrine_Collection $sfGuardUserGroup
@@ -39 +39 @@
  * @method Doctrine_Collection getGroups()                Returns the current record's "groups" collection
  * @method Doctrine_Collection getPermissions()           Returns the current record's "permissions" collection
+ * @method Doctrine_Collection getAPage()                 Returns the current record's "aPage" collection
+ * @method Doctrine_Collection getAAreaVersion()          Returns the current record's "aAreaVersion" collection
+ * @method Doctrine_Collection getAccesses()              Returns the current record's "Accesses" collection
+ * @method Doctrine_Collection getMediaItems()            Returns the current record's "MediaItems" collection
  * @method Doctrine_Collection getBlogAuthorItems()       Returns the current record's "BlogAuthorItems" collection
  * @method Doctrine_Collection getBlogEditorItems()       Returns the current record's "BlogEditorItems" collection
@@ -44 +48 @@
  * @method Doctrine_Collection getBlogCategories()        Returns the current record's "BlogCategories" collection
  * @method Doctrine_Collection getBlogCategoryUsers()     Returns the current record's "BlogCategoryUsers" collection
- * @method Doctrine_Collection getAPage()                 Returns the current record's "aPage" collection
- * @method Doctrine_Collection getAAreaVersion()          Returns the current record's "aAreaVersion" collection
- * @method Doctrine_Collection getAccesses()              Returns the current record's "Accesses" collection
- * @method Doctrine_Collection getMediaItems()            Returns the current record's "MediaItems" collection
  * @method Doctrine_Collection getSfGuardUserPermission() Returns the current record's "sfGuardUserPermission" collection
  * @method Doctrine_Collection getSfGuardUserGroup()      Returns the current record's "sfGuardUserGroup" collection
@@ -61 +61 @@
  * @method sfGuardUser         setGroups()                Sets the current record's "groups" collection
  * @method sfGuardUser         setPermissions()           Sets the current record's "permissions" collection
+ * @method sfGuardUser         setAPage()                 Sets the current record's "aPage" collection
+ * @method sfGuardUser         setAAreaVersion()          Sets the current record's "aAreaVersion" collection
+ * @method sfGuardUser         setAccesses()              Sets the current record's "Accesses" collection
+ * @method sfGuardUser         setMediaItems()            Sets the current record's "MediaItems" collection
  * @method sfGuardUser         setBlogAuthorItems()       Sets the current record's "BlogAuthorItems" collection
  * @method sfGuardUser         setBlogEditorItems()       Sets the current record's "BlogEditorItems" collection
@@ -66 +70 @@
  * @method sfGuardUser         setBlogCategories()        Sets the current record's "BlogCategories" collection
  * @method sfGuardUser         setBlogCategoryUsers()     Sets the current record's "BlogCategoryUsers" collection
- * @method sfGuardUser         setAPage()                 Sets the current record's "aPage" collection
- * @method sfGuardUser         setAAreaVersion()          Sets the current record's "aAreaVersion" collection
- * @method sfGuardUser         setAccesses()              Sets the current record's "Accesses" collection
- * @method sfGuardUser         setMediaItems()            Sets the current record's "MediaItems" collection
  * @method sfGuardUser         setSfGuardUserPermission() Sets the current record's "sfGuardUserPermission" collection
  * @method sfGuardUser         setSfGuardUserGroup()      Sets the current record's "sfGuardUserGroup" collection
@@ -144 +144 @@
              'foreign' => 'permission_id'));
 
+        $this->hasMany('aPage', array(
+             'local' => 'id',
+             'foreign' => 'author_id'));
+
+        $this->hasMany('aAreaVersion', array(
+             'local' => 'id',
+             'foreign' => 'author_id'));
+
+        $this->hasMany('aAccess as Accesses', array(
+             'local' => 'id',
+             'foreign' => 'user_id'));
+
+        $this->hasMany('aMediaItem as MediaItems', array(
+             'local' => 'id',
+             'foreign' => 'owner_id'));
+
         $this->hasMany('aBlogItem as BlogAuthorItems', array(
              'local' => 'id',
@@ -166 +182 @@
              'foreign' => 'user_id'));
 
-        $this->hasMany('aPage', array(
-             'local' => 'id',
-             'foreign' => 'author_id'));
-
-        $this->hasMany('aAreaVersion', array(
-             'local' => 'id',
-             'foreign' => 'author_id'));
-
-        $this->hasMany('aAccess as Accesses', array(
-             'local' => 'id',
-             'foreign' => 'user_id'));
-
-        $this->hasMany('aMediaItem as MediaItems', array(
-             'local' => 'id',
-             'foreign' => 'owner_id'));
-
         $this->hasMany('sfGuardUserPermission', array(
              'local' => 'id',

sandboxes/asandbox/trunk/web/index.php

@@ -4 +4 @@
 require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
 
+// P'UNK TEAM: DO NOT change this file, use frontend_dev.php if you want dev or debug output etc.
+// Changing this file creates problems for everyone else who expects a production environment here.
+// Don't change the environment, don't change the debug flag.
+
+// EVERYONE ELSE: of course you should feel free to change this in your own download of the project.
+// Our preferred approach is to rsync exclude this file and have it be a dev environment on our
+// local boxes and a production environment on production. But that's not the Symfony default,
+// which we're trying to stick with here to help folks see what they expect to see.
+
 $configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', false);
 sfContext::createInstance($configuration)->dispatch();