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
6089a063
Verified
Commit
6089a063
authored
May 18, 2018
by
Kaspar Vollenweider
👻
Browse files
show unterminated group_assignments and assignments earlyer on volunteer edit form
parent
54bc63fd
Pipeline
#19971
failed with stage
in 41 minutes and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/views/volunteers/_form.html.slim
View file @
6089a063
...
...
@@ -78,6 +78,15 @@
=
f
.
input
:bank
,
wrapper_html:
{
class:
'waiver-collapse'
}
=
f
.
input
:iban
,
wrapper_html:
{
class:
'waiver-collapse'
}
-
if
action_edit?
.col-xs-12
-
if
@volunteer
.
assignments
.
unterminated
.
any?
h2
.small
#assignments
Aktuelle
Begleitungen
=
render
'assignments/client_volunteer_index',
assignments:
@volunteer
.assignments.unterminated
-
if
@volunteer
.
group_assignments
.
unterminated
.
any?
h2
.small
#assignments
=
t
(
'volunteer_applications.show.group_assignments'
)
=
render
'group_assignments/volunteer_group_assignments'
,
group_assignments:
@volunteer
.
group_assignments
.
unterminated
,
editable:
true
.row
.col-xs-12.col-md-6
h3
=
t
(
'volunteer_engagement_type_will'
)
...
...
app/views/volunteers/edit.html.slim
View file @
6089a063
...
...
@@ -8,19 +8,10 @@
=
f
.
button
:submit
=
render
'volunteers/form'
,
f:
f
,
volunteer:
@volunteer
-
if
@volunteer
.
assignments
.
unterminated
.
any?
h2
.small
#assignments
Aktuelle
Begleitungen
=
render
'assignments/client_volunteer_index',
assignments:
@volunteer
.assignments.unterminated
-
if
@volunteer
.
assignment_logs
.
any?
h2
.small
Archivierte
Begleitungen
=
render
'assignment_logs/assignment_logs_volunteer_index',
assignment_logs:
@volunteer
.assignment_logs
-
if
@volunteer
.
group_assignments
.
unterminated
.
any?
h2
.small
#assignments
=
t
(
'volunteer_applications.show.group_assignments'
)
=
render
'group_assignments/volunteer_group_assignments'
,
group_assignments:
@volunteer
.
group_assignments
.
unterminated
,
editable:
true
-
if
@volunteer
.
group_assignment_logs
.
any?
h2
.small
=
t
(
'volunteer_applications.show.old_group_assignments'
)
=
render
'group_assignments/volunteer_group_assignments_logs'
,
group_assignment_logs:
@volunteer
.
group_assignment_logs
...
...
Write
Preview
Supports
Markdown
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