To participate you must create an account on apostrophenow.org. If you have already done so, click Login.

Changeset 1731 for sandboxes

Show
Ignore:
Timestamp:
07/12/10 12:10:49 (19 months ago)
Author:
tboutell
Message:

Our default fixtures now create separate superadmin and admin accounts.
The superadmin account can create and remove permissions and groups
from the system, while the admin account can only edit users and add them
to existing groups. This is currently best for client admin use. Of course
you can override these things

Location:
sandboxes/asandbox/branches/1.4
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • sandboxes/asandbox/branches/1.4/data/fixtures/demo_admin_user.yml

    r756 r1731  
     1# Two users by default: a superadmin (we suggest reserving this account for developer use and 
     2# removing it at production launch) and an admin (a member of the admin group). We suggest 
     3# giving the latter account to the client. Out of the box, Apostrophe's group  
     4# dashboard isn't of much use to a client admin (it will be in 1.5) and the permissions  
     5# dashboard is just plain dangerous, so we show only the users dashboard to regular admins 
     6 
    17sfGuardUser: 
     8  sgu_superadmin: 
     9    username: superadmin 
     10    password: demo 
     11    is_super_admin: true 
    212  sgu_admin: 
    313    username: admin 
    414    password: demo 
    5     is_super_admin: true 
     15sfGuardUserGroup: 
     16  sgug_admin_admin: 
     17    sfGuardUser: sgu_admin 
     18    sfGuardGroup: sfGuardGroup_admin 

  • sandboxes/asandbox/branches/1.4/lib/model/doctrine/apostrophePlugin/base/BaseaPage.class.php

    r1659 r1731  
    1717 * @property sfGuardUser $Author 
    1818 * @property sfGuardUser $Deleter 
    19  * @property Doctrine_Collection $aBlogItem 
    20  * @property Doctrine_Collection $BlogCategories 
    21  * @property Doctrine_Collection $aBlogPageCategory 
    2219 * @property Doctrine_Collection $Areas 
    2320 * @property Doctrine_Collection $Accesses 
    … …  
    2623 * @property Doctrine_Collection $aMediaPageCategory 
    2724 * @property Doctrine_Collection $aRedirect 
     25 * @property Doctrine_Collection $aBlogItem 
     26 * @property Doctrine_Collection $BlogCategories 
     27 * @property Doctrine_Collection $aBlogPageCategory 
    2828 *  
    2929 * @method integer             getId()                 Returns the current record's "id" value 
    … …  
    3838 * @method sfGuardUser         getAuthor()             Returns the current record's "Author" value 
    3939 * @method sfGuardUser         getDeleter()            Returns the current record's "Deleter" value 
    40  * @method Doctrine_Collection getABlogItem()          Returns the current record's "aBlogItem" collection 
    41  * @method Doctrine_Collection getBlogCategories()     Returns the current record's "BlogCategories" collection 
    42  * @method Doctrine_Collection getABlogPageCategory()  Returns the current record's "aBlogPageCategory" collection 
    4340 * @method Doctrine_Collection getAreas()              Returns the current record's "Areas" collection 
    4441 * @method Doctrine_Collection getAccesses()           Returns the current record's "Accesses" collection 
    … …  
    4744 * @method Doctrine_Collection getAMediaPageCategory() Returns the current record's "aMediaPageCategory" collection 
    4845 * @method Doctrine_Collection getARedirect()          Returns the current record's "aRedirect" collection 
     46 * @method Doctrine_Collection getABlogItem()          Returns the current record's "aBlogItem" collection 
     47 * @method Doctrine_Collection getBlogCategories()     Returns the current record's "BlogCategories" collection 
     48 * @method Doctrine_Collection getABlogPageCategory()  Returns the current record's "aBlogPageCategory" collection 
    4949 * @method aPage               setId()                 Sets the current record's "id" value 
    5050 * @method aPage               setSlug()               Sets the current record's "slug" value 
    … …  
    5858 * @method aPage               setAuthor()             Sets the current record's "Author" value 
    5959 * @method aPage               setDeleter()            Sets the current record's "Deleter" value 
    60  * @method aPage               setABlogItem()          Sets the current record's "aBlogItem" collection 
    61  * @method aPage               setBlogCategories()     Sets the current record's "BlogCategories" collection 
    62  * @method aPage               setABlogPageCategory()  Sets the current record's "aBlogPageCategory" collection 
    6360 * @method aPage               setAreas()              Sets the current record's "Areas" collection 
    6461 * @method aPage               setAccesses()           Sets the current record's "Accesses" collection 
    … …  
    6764 * @method aPage               setAMediaPageCategory() Sets the current record's "aMediaPageCategory" collection 
    6865 * @method aPage               setARedirect()          Sets the current record's "aRedirect" collection 
     66 * @method aPage               setABlogItem()          Sets the current record's "aBlogItem" collection 
     67 * @method aPage               setBlogCategories()     Sets the current record's "BlogCategories" collection 
     68 * @method aPage               setABlogPageCategory()  Sets the current record's "aBlogPageCategory" collection 
    6969 *  
    7070 * @package    content 
    … …  
    146146             'foreign' => 'id')); 
    147147 
    148         $this->hasMany('aBlogItem', array( 
    149              'local' => 'id', 
    150              'foreign' => 'page_id')); 
    151  
    152         $this->hasMany('aBlogCategory as BlogCategories', array( 
    153              'refClass' => 'aBlogPageCategory', 
    154              'local' => 'page_id', 
    155              'foreign' => 'blog_category_id')); 
    156  
    157         $this->hasMany('aBlogPageCategory', array( 
    158              'local' => 'id', 
    159              'foreign' => 'page_id')); 
    160  
    161148        $this->hasMany('aArea as Areas', array( 
    162149             'local' => 'id', 
    … …  
    184171             'foreign' => 'page_id')); 
    185172 
     173        $this->hasMany('aBlogItem', array( 
     174             'local' => 'id', 
     175             'foreign' => 'page_id')); 
     176 
     177        $this->hasMany('aBlogCategory as BlogCategories', array( 
     178             'refClass' => 'aBlogPageCategory', 
     179             'local' => 'page_id', 
     180             'foreign' => 'blog_category_id')); 
     181 
     182        $this->hasMany('aBlogPageCategory', array( 
     183             'local' => 'id', 
     184             'foreign' => 'page_id')); 
     185 
    186186        $timestampable0 = new Doctrine_Template_Timestampable(array( 
    187187             )); 

  • sandboxes/asandbox/branches/1.4/lib/model/doctrine/apostrophePlugin/base/BaseaSlot.class.php

    r1659 r1731  
    6363 
    6464        $this->setSubClasses(array( 
    65              'aBlogSlot' =>  
    66              array( 
    67               'type' => 'aBlog', 
    68              ), 
    69              'aBlogSingleSlot' =>  
    70              array( 
    71               'type' => 'aBlogSingle', 
    72              ), 
    73              'aEventSlot' =>  
    74              array( 
    75               'type' => 'aEvent', 
    76              ), 
    77              'aEventSingleSlot' =>  
    78              array( 
    79               'type' => 'aEventSingle', 
    80              ), 
    8165             'aTextSlot' =>  
    8266             array( 
    … …  
    123107              'type' => 'aNewRichText', 
    124108             ), 
     109             'aBlogSlot' =>  
     110             array( 
     111              'type' => 'aBlog', 
     112             ), 
     113             'aBlogSingleSlot' =>  
     114             array( 
     115              'type' => 'aBlogSingle', 
     116             ), 
     117             'aEventSlot' =>  
     118             array( 
     119              'type' => 'aEvent', 
     120             ), 
     121             'aEventSingleSlot' =>  
     122             array( 
     123              'type' => 'aEventSingle', 
     124             ), 
    125125             )); 
    126126    } 

  • sandboxes/asandbox/branches/1.4/lib/model/doctrine/sfDoctrineGuardPlugin/base/BasesfGuardUser.class.php

    r1659 r1731  
    1616 * @property Doctrine_Collection $groups 
    1717 * @property Doctrine_Collection $permissions 
     18 * @property Doctrine_Collection $aPage 
     19 * @property Doctrine_Collection $aAreaVersion 
     20 * @property Doctrine_Collection $Accesses 
     21 * @property Doctrine_Collection $MediaItems 
    1822 * @property Doctrine_Collection $BlogAuthorItems 
    1923 * @property Doctrine_Collection $BlogEditorItems 
    … …  
    2125 * @property Doctrine_Collection $BlogCategories 
    2226 * @property Doctrine_Collection $BlogCategoryUsers 
    23  * @property Doctrine_Collection $aPage 
    24  * @property Doctrine_Collection $aAreaVersion 
    25  * @property Doctrine_Collection $Accesses 
    26  * @property Doctrine_Collection $MediaItems 
    2727 * @property Doctrine_Collection $sfGuardUserPermission 
    2828 * @property Doctrine_Collection $sfGuardUserGroup 
    … …  
    3939 * @method Doctrine_Collection getGroups()                Returns the current record's "groups" collection 
    4040 * @method Doctrine_Collection getPermissions()           Returns the current record's "permissions" collection 
     41 * @method Doctrine_Collection getAPage()                 Returns the current record's "aPage" collection 
     42 * @method Doctrine_Collection getAAreaVersion()          Returns the current record's "aAreaVersion" collection 
     43 * @method Doctrine_Collection getAccesses()              Returns the current record's "Accesses" collection 
     44 * @method Doctrine_Collection getMediaItems()            Returns the current record's "MediaItems" collection 
    4145 * @method Doctrine_Collection getBlogAuthorItems()       Returns the current record's "BlogAuthorItems" collection 
    4246 * @method Doctrine_Collection getBlogEditorItems()       Returns the current record's "BlogEditorItems" collection 
    … …  
    4448 * @method Doctrine_Collection getBlogCategories()        Returns the current record's "BlogCategories" collection 
    4549 * @method Doctrine_Collection getBlogCategoryUsers()     Returns the current record's "BlogCategoryUsers" collection 
    46  * @method Doctrine_Collection getAPage()                 Returns the current record's "aPage" collection 
    47  * @method Doctrine_Collection getAAreaVersion()          Returns the current record's "aAreaVersion" collection 
    48  * @method Doctrine_Collection getAccesses()              Returns the current record's "Accesses" collection 
    49  * @method Doctrine_Collection getMediaItems()            Returns the current record's "MediaItems" collection 
    5050 * @method Doctrine_Collection getSfGuardUserPermission() Returns the current record's "sfGuardUserPermission" collection 
    5151 * @method Doctrine_Collection getSfGuardUserGroup()      Returns the current record's "sfGuardUserGroup" collection 
    … …  
    6161 * @method sfGuardUser         setGroups()                Sets the current record's "groups" collection 
    6262 * @method sfGuardUser         setPermissions()           Sets the current record's "permissions" collection 
     63 * @method sfGuardUser         setAPage()                 Sets the current record's "aPage" collection 
     64 * @method sfGuardUser         setAAreaVersion()          Sets the current record's "aAreaVersion" collection 
     65 * @method sfGuardUser         setAccesses()              Sets the current record's "Accesses" collection 
     66 * @method sfGuardUser         setMediaItems()            Sets the current record's "MediaItems" collection 
    6367 * @method sfGuardUser         setBlogAuthorItems()       Sets the current record's "BlogAuthorItems" collection 
    6468 * @method sfGuardUser         setBlogEditorItems()       Sets the current record's "BlogEditorItems" collection 
    … …  
    6670 * @method sfGuardUser         setBlogCategories()        Sets the current record's "BlogCategories" collection 
    6771 * @method sfGuardUser         setBlogCategoryUsers()     Sets the current record's "BlogCategoryUsers" collection 
    68  * @method sfGuardUser         setAPage()                 Sets the current record's "aPage" collection 
    69  * @method sfGuardUser         setAAreaVersion()          Sets the current record's "aAreaVersion" collection 
    70  * @method sfGuardUser         setAccesses()              Sets the current record's "Accesses" collection 
    71  * @method sfGuardUser         setMediaItems()            Sets the current record's "MediaItems" collection 
    7272 * @method sfGuardUser         setSfGuardUserPermission() Sets the current record's "sfGuardUserPermission" collection 
    7373 * @method sfGuardUser         setSfGuardUserGroup()      Sets the current record's "sfGuardUserGroup" collection 
    … …  
    144144             'foreign' => 'permission_id')); 
    145145 
     146        $this->hasMany('aPage', array( 
     147             'local' => 'id', 
     148             'foreign' => 'author_id')); 
     149 
     150        $this->hasMany('aAreaVersion', array( 
     151             'local' => 'id', 
     152             'foreign' => 'author_id')); 
     153 
     154        $this->hasMany('aAccess as Accesses', array( 
     155             'local' => 'id', 
     156             'foreign' => 'user_id')); 
     157 
     158        $this->hasMany('aMediaItem as MediaItems', array( 
     159             'local' => 'id', 
     160             'foreign' => 'owner_id')); 
     161 
    146162        $this->hasMany('aBlogItem as BlogAuthorItems', array( 
    147163             'local' => 'id', 
    … …  
    166182             'foreign' => 'user_id')); 
    167183 
    168         $this->hasMany('aPage', array( 
    169              'local' => 'id', 
    170              'foreign' => 'author_id')); 
    171  
    172         $this->hasMany('aAreaVersion', array( 
    173              'local' => 'id', 
    174              'foreign' => 'author_id')); 
    175  
    176         $this->hasMany('aAccess as Accesses', array( 
    177              'local' => 'id', 
    178              'foreign' => 'user_id')); 
    179  
    180         $this->hasMany('aMediaItem as MediaItems', array( 
    181              'local' => 'id', 
    182              'foreign' => 'owner_id')); 
    183  
    184184        $this->hasMany('sfGuardUserPermission', array( 
    185185             'local' => 'id',