Update for RC.

vanmil · Feb 14, 2015 · f00d26c · f00d26c
1 parent 9167a4c
commit f00d26c
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/components/Account.php b/components/Account.php
@@ -8,8 +8,8 @@
 use Validator;
 use Cms\Classes\Page;
 use Cms\Classes\ComponentBase;
-use System\Classes\ApplicationException;
-use October\Rain\Support\ValidationException;
+use ApplicationException;
+use ValidationException;
 use RainLab\User\Models\Settings as UserSettings;
 use Exception;
 

diff --git a/components/ResetPassword.php b/components/ResetPassword.php
@@ -4,8 +4,8 @@
 use Mail;
 use Validator;
 use Cms\Classes\ComponentBase;
-use October\Rain\Support\ValidationException;
-use System\Classes\ApplicationException;
+use ValidationException;
+use ApplicationException;
 
 class ResetPassword extends ComponentBase
 {

diff --git a/components/Session.php b/components/Session.php
@@ -5,7 +5,7 @@
 use Redirect;
 use Cms\Classes\Page;
 use Cms\Classes\ComponentBase;
-use October\Rain\Support\ValidationException;
+use ValidationException;
 
 class Session extends ComponentBase
 {

diff --git a/controllers/Locations.php b/controllers/Locations.php
@@ -73,6 +73,6 @@ public function onDisableLocations()
         else
             Flash::success(Lang::get('rainlab.user::lang.locations.disable_success'));
 
-        return Redirect::to(Backend::url('rainlab/user/locations'));
+        return Backend::redirect('rainlab/user/locations');
     }
 }
diff --git a/controllers/locations/config_form.yaml b/controllers/locations/config_form.yaml
@@ -6,7 +6,7 @@
 name: rainlab.user::lang.location.label
 
 # Model Form Field configuration
-form: @/plugins/rainlab/user/models/country/fields.yaml
+form: ~/plugins/rainlab/user/models/country/fields.yaml
 
 # Model Class name
 modelClass: RainLab\User\Models\Country

diff --git a/controllers/locations/config_list.yaml b/controllers/locations/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 # Model List Column configuration
-list: @/plugins/rainlab/user/models/country/columns.yaml
+list: ~/plugins/rainlab/user/models/country/columns.yaml
 
 # Model Class name
 modelClass: RainLab\User\Models\Country

diff --git a/controllers/users/config_form.yaml b/controllers/users/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 name: rainlab.user::lang.user.label
-form: @/plugins/rainlab/user/models/user/fields.yaml
+form: ~/plugins/rainlab/user/models/user/fields.yaml
 modelClass: RainLab\User\Models\User
 defaultRedirect: rainlab/user/users
 

diff --git a/controllers/users/config_list.yaml b/controllers/users/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: rainlab.user::lang.users.list_title
-list: @/plugins/rainlab/user/models/user/columns.yaml
+list: ~/plugins/rainlab/user/models/user/columns.yaml
 modelClass: RainLab\User\Models\User
 recordUrl: rainlab/user/users/update/:id
 noRecordsMessage: backend::lang.list.no_records

diff --git a/models/settings/fields.yaml b/models/settings/fields.yaml
@@ -67,4 +67,4 @@ tabs:
             comment: rainlab.user::lang.settings.default_state_comment
             type: dropdown
             tab: rainlab.user::lang.settings.location_tab
-            depends: default_country
+            dependsOn: default_country
diff --git a/models/user/fields.yaml b/models/user/fields.yaml
@@ -53,7 +53,7 @@ tabs:
             type: dropdown
             tab: rainlab.user::lang.user.details
             span: right
-            depends: country
+            dependsOn: country
             placeholder: rainlab.user::lang.user.select_state
 
         username:

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -25,4 +25,5 @@
 1.0.12:
     - Create a dedicated setting for choosing the login mode.
     - users_rename_login_to_username.php
-1.0.13: Minor fix to the Account sign in logic.
+1.0.13: Minor fix to the Account sign in logic.
+1.0.14: Minor improvements to the code.