diff --git a/app/config/version.php b/app/config/version.php index ff1f83817a..740b0b2f46 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-pre', - 'hash_version' => 'v2.0-pre-beta-392-ge9e62fb', + 'hash_version' => 'v2.0-pre-beta-393-g2036402', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 483fc793ef..02b598dfbf 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -1138,7 +1138,15 @@ class UsersController extends AdminController { $validator = Validator::make($item, $this->ldapValidationRules); if ($validator->fails()) { - $item["note"] = "Validator failed: " . $validator->messages(); + $validator_msg = ''; + + foreach($validator->messages()->all() as $key) + { + $validator_msg .= '
  • '.$key; + } + + $item["note"] = 'Validator failed:
    '.$validator_msg.'
    '; + } else { // Create the user if they don't exist. diff --git a/app/views/backend/users/import.blade.php b/app/views/backend/users/import.blade.php index cb121c089e..5699a8e333 100644 --- a/app/views/backend/users/import.blade.php +++ b/app/views/backend/users/import.blade.php @@ -19,7 +19,7 @@ Create a User :: - +
    diff --git a/app/views/backend/users/ldap.blade.php b/app/views/backend/users/ldap.blade.php index 3945d7ae12..4498e52f97 100644 --- a/app/views/backend/users/ldap.blade.php +++ b/app/views/backend/users/ldap.blade.php @@ -29,7 +29,8 @@ Create a User :: - + + @if (Config::get('ldap.url')=='') @Lang('admin/users/message.ldap_not_configured')