mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2024-11-28 09:24:24 +01:00
asterisk on group select in member form
This commit is contained in:
parent
906bb5b26e
commit
5b7e8474d4
@ -2,6 +2,7 @@
|
||||
|
||||
## next release
|
||||
- Mask new notifications alerts when more than 3
|
||||
- Added an asterisk on group select in admin's member form
|
||||
- Fix a bug: display more than 15 unread notifications (number on the bell icon & full list)
|
||||
- Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted
|
||||
- Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year
|
||||
|
@ -1,5 +1,8 @@
|
||||
<div class="form-group" ng-class="{'has-error': userForm['user[group_id]'].$dirty && userForm['user[group_id]'].$invalid}">
|
||||
<label for="user_group_id" class="col-sm-3 control-label" translate>{{ 'group' }}</label>
|
||||
<label for="user_group_id" class="col-sm-3 control-label">
|
||||
<span translate>{{ 'group' }}</span>
|
||||
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
|
||||
</label>
|
||||
<div class="col-sm-9">
|
||||
<select ng-model="user.group_id" ng-disabled="user.subscribed_plan" class="form-control" name="user[group_id]" id="user_group_id" ng-options="g.id as g.name for g in groups" required>
|
||||
</select>
|
||||
|
@ -96,7 +96,7 @@ class Availability < ActiveRecord::Base
|
||||
|
||||
def as_indexed_json
|
||||
json = JSON.parse(to_json)
|
||||
json['hours_duration'] = (end_at - start_at) / (60*60)
|
||||
json['hours_duration'] = (end_at - start_at) / (60 * 60)
|
||||
json.to_json
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user