Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
whats-open
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
9
Issues
9
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
whats-open
Commits
f45f181f
Commit
f45f181f
authored
Mar 06, 2018
by
Daniel W Bond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clarified wording presented to users, tried a little harder to meet the 79 chracter break
parent
78d54af1
Pipeline
#2168
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
whats-open/api/admin.py
whats-open/api/admin.py
+11
-6
whats-open/api/templates/bulk_schedules_intermediate.html
whats-open/api/templates/bulk_schedules_intermediate.html
+1
-1
No files found.
whats-open/api/admin.py
View file @
f45f181f
...
...
@@ -28,7 +28,8 @@ class FacilityAdmin(admin.ModelAdmin):
num
=
queryset
.
count
()
for
facility
in
queryset
:
facility
.
special_schedules
.
clear
()
self
.
message_user
(
request
,
"Successfully removed special schedules from %d facilities."
%
num
)
self
.
message_user
(
request
,
"Successfully cleared all special schedules for %d facilities."
%
num
)
drop_special_schedules
.
short_description
=
'Clear all special schedules'
def
assign_bulk_schedules
(
self
,
request
,
queryset
):
num
=
queryset
.
count
()
...
...
@@ -40,15 +41,17 @@ class FacilityAdmin(admin.ModelAdmin):
for
facility
in
queryset
:
facility
.
main_schedule
=
new_schedule
facility
.
save
()
self
.
message_user
(
request
,
"Set %s as the main schedule for %d facilities."
%
(
name
,
num
))
self
.
message_user
(
request
,
"Set %s as the main schedule for %d facilities."
%
(
name
,
num
))
except
ObjectDoesNotExist
:
self
.
message_user
(
request
,
"Unable to set schedule for %d facilities."
%
num
)
self
.
message_user
(
request
,
"Unable to set a new main schedule for %d facilities."
%
num
)
return
HttpResponseRedirect
(
request
.
get_full_path
())
return
render
(
request
,
'bulk_schedules_intermediate.html'
,
context
=
{
'facilities'
:
queryset
,
'schedules'
:
Schedule
.
objects
.
all
()})
assign_bulk_schedules
.
short_description
=
'
Assign
a main schedule for multiple facilities'
assign_bulk_schedules
.
short_description
=
'
Set
a main schedule for multiple facilities'
def
assign_bulk_special_schedules
(
self
,
request
,
queryset
):
num
=
queryset
.
count
()
...
...
@@ -60,9 +63,11 @@ class FacilityAdmin(admin.ModelAdmin):
for
facility
in
queryset
:
facility
.
special_schedules
.
add
(
new_special_schedule
)
facility
.
save
()
self
.
message_user
(
request
,
"Added %s as a special schedule to %d facilities."
%
(
name
,
num
))
self
.
message_user
(
request
,
"Added %s as a special schedule to %d facilities."
%
(
name
,
num
))
except
ObjectDoesNotExist
:
self
.
message_user
(
request
,
"Unable to add a special schedule to %d facilities."
%
num
)
self
.
message_user
(
request
,
"Unable to add additional special schedule to %d facilities."
%
num
)
return
HttpResponseRedirect
(
request
.
get_full_path
())
return
render
(
request
,
'bulk_special_schedules_intermediate.html'
,
...
...
whats-open/api/templates/bulk_schedules_intermediate.html
View file @
f45f181f
...
...
@@ -10,7 +10,7 @@
{% endfor %}
</select>
<p>
Assign
this as the main schedule for all of these facilities?
</p>
<p>
Set
this as the main schedule for all of these facilities?
</p>
<ul>
{% for facility in facilities %}
<li>
{{ facility.facility_name }}
</li>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment