DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-02 17:23:14 -07:00
parent 2330e5ee57 f47075c180
commit d5635f32e5
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/ProfileController.php
View file

@ -108,12 +108,12 @@ class ProfileController extends Controller
{
if (config('app.lock_passwords')) {
return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/table.lock_passwords'));
return redirect()->route('account.password.index')->with('error', trans('admin/users/table.lock_passwords'));
}
$user = Auth::user();
if ($user->ldap_import=='1') {
return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/message.error.password_ldap'));
return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap'));
}
$rules = array(

1
app/Http/Transformers/LicensesTransformer.php
View file

@ -30,7 +30,6 @@ class LicensesTransformer
'purchase_order' => e($license->purchase_order),
'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'),
'purchase_cost' => e($license->purchase_cost),
'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
'notes' => e($license->notes),
'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
'total_seats' => (int) $license->seats,

14
resources/views/account/change-password.blade.php
View file

@ -21,18 +21,16 @@
<!-- Old Password -->
<div class="form-group {{ $errors->has('current_password') ? ' has-error' : '' }}">
<label for="current_password" class="col-md-3 control-label">Current Password
<i class='fa fa-asterisk'></i>
</label>
<div class="col-md-5">
<div class="col-md-5 required">
<input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('current_password', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div>
</div>
<div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password" class="col-md-3 control-label">New Password
<i class='fa fa-asterisk'></i></label>
<div class="col-md-5">
<label for="password" class="col-md-3 control-label">New Password</label>
<div class="col-md-5 required">
<input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('password', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div>
@ -40,10 +38,8 @@
<div class="form-group {{ $errors->has('password_confirm') ? ' has-error' : '' }}">
<label for="password_confirm" class="col-md-3 control-label">New Password
<i class='fa fa-asterisk'></i>
</label>
<div class="col-md-5">
<label for="password_confirm" class="col-md-3 control-label">New Password</label>
<div class="col-md-5 required">
<input class="form-control" type="password" name="password_confirm" id="password_confirm" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
{!! $errors->first('password_confirm', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@if (config('app.lock_passwords'))