Permalink
Browse files

fixed hardcoded aliases, add web-user-behavior dep

  • Loading branch information...
1 parent a09a888 commit d3d79c0648790aaddeccb83b6b04d275c4c632fe @schmunk42 schmunk42 committed Feb 28, 2013
Showing with 78 additions and 20 deletions.
  1. +11 −1 UPGRADE.md
  2. +1 −0 composer.json
  3. +59 −19 composer.lock
  4. +7 −0 config/main.php
View
@@ -6,6 +6,10 @@ Upgrade Guide
### Upgrading from v0.11.x
+`composer.json`
+
+ "schmunk42/web-user-behavior":"*",
+
`config/main.php`
`aliases`
@@ -15,7 +19,13 @@ Upgrade Guide
'application.modules.user.components' => 'application.vendor.mishamx.yii-user.components',
'ext.editable.assets.js.locales' => 'application.vendor.vitalets.yii-bootstrap-editable.assets.js.locales',
'ext.editable.assets' => 'application.vendor.vitalets.yii-bootstrap-editable.assets',
-
+
+`components`
+
+ 'user' => array(
+ 'behaviors' => array('application.vendor.schmunk42.web-user-behavior.WebUserBehavior'), // compatibility behavior for yii-user and yii-rights
+ ),
+
`blueimp/jquery-file-upload` replaces the former fork from `phundament/jquery-file-upload`.
### Upgrading from v0.10.x
View
@@ -35,6 +35,7 @@
"yiisoft/yii":"1.1.12",
"crisu83/yii-rights":"@dev",
"mishamx/yii-user":"@dev",
+ "schmunk42/web-user-behavior":"*",
"phundament/p3admin":"0.10.*",
"phundament/p3widgets":"0.10.*",
"phundament/p3pages":"0.9.*",
View
Oops, something went wrong.
View
@@ -48,6 +48,12 @@
// p3media
'jquery-file-upload' => 'application.vendor.phundament.jquery-file-upload',
'jquery-file-upload-widget' => 'application.vendor.phundament.p3extensions.widgets.jquery-file-upload',
+
+ // yii-user path fixes
+ 'application.modules.user.views.asset' => 'application.vendor.mishamx.yii-user.views.asset',
+ 'application.modules.user.components' => 'application.vendor.mishamx.yii-user.components',
+ 'ext.editable.assets.js.locales' => 'application.vendor.vitalets.yii-bootstrap-editable.assets.js.locales',
+ 'ext.editable.assets' => 'application.vendor.vitalets.yii-bootstrap-editable.assets',
),
'modules' => array(
// uncomment the following to enable the Gii tool
@@ -287,6 +293,7 @@
'user' => array(
// enable cookie-based authentication
'class' => 'RWebUser', // mishamx/yii-rights: Allows super users access implicitly.
+ 'behaviors' => array('application.vendor.schmunk42.web-user-behavior.WebUserBehavior'), // compatibility behavior for yii-user and yii-rights
'allowAutoLogin' => true,
'loginUrl' => array('/user/login'),
),

0 comments on commit d3d79c0

Please sign in to comment.