Nicer error messages on validation fail for LDAP
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v2.0-pre',
|
||||
'hash_version' => 'v2.0-pre-beta-392-ge9e62fb',
|
||||
'hash_version' => 'v2.0-pre-beta-393-g2036402',
|
||||
);
|
||||
@@ -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 .= '<li>'.$key;
|
||||
}
|
||||
|
||||
$item["note"] = '<span class="alert-msg">Validator failed: <br>'.$validator_msg.'</span>';
|
||||
|
||||
} else {
|
||||
|
||||
// Create the user if they don't exist.
|
||||
|
||||
@@ -19,7 +19,7 @@ Create a User ::
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="{{ Config::get('app.cdn.default') }}/js/pGenerator.jquery.js"></script>
|
||||
<script type="text/javascript" src="{{ asset('/assets/js/pGenerator.jquery.js') }}"></script>
|
||||
|
||||
<form class="form-horizontal" role="form" method="post" enctype="multipart/form-data" action="">
|
||||
<!-- CSRF Token -->
|
||||
|
||||
@@ -29,7 +29,8 @@ Create a User ::
|
||||
</div>
|
||||
</h3>
|
||||
</div>
|
||||
<script type="text/javascript" src="{{ Config::get('app.cdn.default') }}/js/pGenerator.jquery.js"></script>
|
||||
|
||||
<script type="text/javascript" src="{{ asset('/assets/js/pGenerator.jquery.js') }}"></script>
|
||||
|
||||
@if (Config::get('ldap.url')=='')
|
||||
@Lang('admin/users/message.ldap_not_configured')
|
||||
|
||||
Reference in New Issue
Block a user