Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
9031b5c4
Commit
9031b5c4
authored
Mar 01, 2018
by
Tugce Nur Tas
Browse files
review changes
parent
afd3aa3c
Pipeline
#15437
passed with stage
in 42 minutes and 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/controllers/volunteers_controller.rb
View file @
9031b5c4
...
...
@@ -27,7 +27,9 @@ class VolunteersController < ApplicationController
end
end
def
show
;
end
def
show
@volunteer_events
=
@volunteer
.
events
.
past
end
def
new
@volunteer
=
Volunteer
.
new
...
...
app/views/events/_volunteer_events.html.slim
View file @
9031b5c4
...
...
@@ -13,16 +13,16 @@ button.btn.btn-default(data-toggle='collapse' data-target='#volunteer-events' ty
th
Departement
th
tbody
-
events
.
past
.
each
do
|
event
|
-
events
.
each
do
|
event
|
tr
td
=
event
.
title
if
event
.
title
td
=
event
.
title
td
=
t
(
".
#{
event
.
kind
}
"
)
if
event
.
kind
td
=
l
(
event
.
date
.
to_date
)
if
event
.
date
td
=
l
(
event
.
date
)
if
event
.
date
td
=
"
#{
(
event
.
start_time
.
strftime
(
'%H:%M'
))
}
- "
if
event
.
start_time
=
"
#{
(
event
.
end_time
.
strftime
(
'%H:%M'
))
}
"
if
event
.
end_time
td
=
event
.
title
if
event
.
title
td
=
event
.
department
.
contact
.
last_name
if
event
.
department
td
=
event
.
department
&
.
contact
&
.
last_name
td
.index-action-cell.hidden-print
span
=
link_to
t_action
(
:show
),
event_path
(
event
)
hr
app/views/volunteers/show.html.slim
View file @
9031b5c4
...
...
@@ -192,8 +192,8 @@ h2.small= t('.availability')
h2
.small
=
t
(
'.old_group_assignments'
)
=
render
'group_assignments/volunteer_group_assignments_logs'
,
group_assignment_logs:
@volunteer
.
group_assignment_logs
-
if
policy
(
Event
).
show?
&&
@volunteer
.
events
.
p
ast
.
any
?
=
render
'events/volunteer_events'
,
events:
@volunteer
.
events
-
if
policy
(
Event
).
show?
&&
@volunteer
_
events
.
p
resent
?
=
render
'events/volunteer_events'
,
events:
@volunteer
_
events
nav
.navbar.section-navigation
ul
.list-inline
...
...
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