rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

(bug) unable to edit an event

Browse Source
This commit is contained in:
Sylvain 2022-06-15 09:42:39 +02:00
parent 61080a5188
commit 48e1cf782f
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
- Run the docker image with the system user - Run the docker image with the system user
- During the setup, autoconfigure the main domain - During the setup, autoconfigure the main domain
- During the setup, ask to set ALLOW_INSECURE_HTTP if DEFAULT_PROTOCOL was set to http - During the setup, ask to set ALLOW_INSECURE_HTTP if DEFAULT_PROTOCOL was set to http
- Fix a bug: unable to edit an event
- Fix a bug: unable to generate the secret key base during the setup - Fix a bug: unable to generate the secret key base during the setup
- Fix a bug: error message during the setup: the input device is not a TTY - Fix a bug: error message during the setup: the input device is not a TTY
- Fix a bug: when Fab-manager was installed as non-root user, unable to compile the assets during the upgrade - Fix a bug: when Fab-manager was installed as non-root user, unable to compile the assets during the upgrade

6
app/frontend/templates/events/_form.html
View File

@ -138,10 +138,10 @@
<label class="v-bottom" translate>{{ 'app.shared.event.all_day' }}</label> <label class="v-bottom" translate>{{ 'app.shared.event.all_day' }}</label>
<div class="inline v-top"> <div class="inline v-top">
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="radio" name="event[all_day]" ng-model="event.all_day" value="true" required/> {{ 'app.shared.buttons.yes' | translate }} <input type="radio" name="event[all_day]" ng-model="event.all_day" ng-value="true" required/> {{ 'app.shared.buttons.yes' | translate }}
</label> </label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="radio" name="event[all_day]" ng-model="event.all_day" value="false"/> {{ 'app.shared.buttons.no' | translate }} <input type="radio" name="event[all_day]" ng-model="event.all_day" ng-value="false"/> {{ 'app.shared.buttons.no' | translate }}
</label> </label>
</div> </div>
</div> </div>
@ -180,7 +180,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="m-b row" ng-if="event.all_day =='false'"> <div class="m-b row" ng-if="event.all_day === false">
<div class="col-xs-6"> <div class="col-xs-6">
<label translate>{{ 'app.shared.event.start_time' }}</label> <label translate>{{ 'app.shared.event.start_time' }}</label>
<div> <div>

4
app/models/event.rb
View File

@ -84,6 +84,10 @@ class Event < ApplicationRecord
end end
end end
def all_day?
availability.start_at.hour.zero?
end
private private
def event_recurrence def event_recurrence

2
app/views/api/events/_event.json.jbuilder
View File

@ -32,7 +32,7 @@ json.end_time event.availability.end_at
json.month t('date.month_names')[event.availability.start_at.month] json.month t('date.month_names')[event.availability.start_at.month]
json.month_id event.availability.start_at.month json.month_id event.availability.start_at.month
json.year event.availability.start_at.year json.year event.availability.start_at.year
json.all_day event.availability.start_at.hour.zero? json.all_day event.all_day?
json.availability do json.availability do
json.id event.availability.id json.id event.availability.id
json.start_at event.availability.start_at json.start_at event.availability.start_at