Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
scriptorium
Manage
Activity
Members
Labels
Plan
Issues
21
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
degrowth
scriptorium
Commits
300e43ef
Commit
300e43ef
authored
6 years ago
by
Jon Richter
Browse files
Options
Downloads
Patches
Plain Diff
refactor fallbacks for unscheduled events to also show those without time slots
parent
e0589783
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!22
attempt correcting display of overlapping events
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/schedule/_unscheduled_events.html.haml
+14
-6
14 additions, 6 deletions
app/views/schedule/_unscheduled_events.html.haml
app/views/schedule/index.html.haml
+0
-1
0 additions, 1 deletion
app/views/schedule/index.html.haml
with
14 additions
and
7 deletions
app/views/schedule/_unscheduled_events.html.haml
+
14
−
6
View file @
300e43ef
-
@unscheduled_events
.
each
do
|
event
|
-
if
event
.
time_slots
!=
nil
%li
.unscheduled-event
{
:id
=>
"event_#{event.id}"
,
:"data-update-url"
=>
schedule_update_event_path
(
:id
=>
event
.
id
),
:"data-height"
=>
(
event
.
time_slots
*
20
-
7
)
}
=
link_to
event
.
title
,
"#"
-
if
@unscheduled_events
!=
nil
%h2
No rooms assigned:
-
@unscheduled_events
.
each
do
|
event
|
-
if
event
.
time_slots
!=
nil
%li
.unscheduled-event
{
:id
=>
"event_#{event.id}"
,
:"data-update-url"
=>
schedule_update_event_path
(
:id
=>
event
.
id
),
:"data-height"
=>
(
event
.
time_slots
*
20
-
7
)
}
=
link_to
event
.
title
,
"#"
%h2
No time slots assigned:
-
@unscheduled_events
.
each
do
|
event
|
-
if
event
.
time_slots
=
nil
%li
.unscheduled-event
{
:id
=>
"event_#{event.id}"
,
:"data-update-url"
=>
schedule_update_event_path
(
:id
=>
event
.
id
),
=
link_to
event
.
title
,
"#"
This diff is collapsed.
Click to expand it.
app/views/schedule/index.html.haml
+
0
−
1
View file @
300e43ef
...
...
@@ -67,7 +67,6 @@
#event-pane
-
@scheduled_events
.
each
do
|
event
|
=
render
'event'
,
:event
=>
event
%h2
No rooms assigned:
#add-event-modal
.modal
{
:style
=>
"display: none;"
}
.modal-header
=
link_to
"×"
,
"#"
,
:class
=>
"close"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment