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
e230b14e
Commit
e230b14e
authored
Jan 04, 2018
by
Chrysanthi Lagodimou
Browse files
remove state and affirmation from volunteer show
parent
306e7672
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/layout/_content.scss
View file @
e230b14e
...
...
@@ -137,7 +137,8 @@
}
// # TODO remove when button gets the change status functionality
td
.button-acceptance
a
{
td
.button-acceptance
a
,
li
.button-acceptance
a
{
pointer-events
:
none
;
}
...
...
app/views/volunteers/show.html.slim
View file @
e230b14e
h1
=
@volunteer
.
contact
.
full_name
-
if
@volunteer
.
rejected?
-
if
@volunteer
.
rejection_type
.
present?
h4
=
"
#{
t_attr
(
:rejection_type
)
}
:
#{
t
(
"rejection_type.
#{
@volunteer
.
rejection_type
}
"
)
}
"
-
if
@volunteer
.
rejection_text
.
present?
h4
=
"
#{
t_attr
(
:rejection_text
)
}
:
#{
@volunteer
.
rejection_text
}
"
nav
.navbar.section-navigation
ul
.list-inline
...
...
@@ -101,21 +106,6 @@ h3 Persönlicher Hintergrund
tr
td
=
t_attr
(
:interests
)
td
=
@volunteer
.
interests
-
if
policy
(
Volunteer
).
acceptance?
tr
td
=
t_attr
(
:acceptance
)
td
=
t
(
".acceptance.
#{
@volunteer
.
acceptance
}
"
)
-
if
policy
(
Volunteer
).
state?
tr
td
=
t_attr
(
:state
)
td
=
t
(
"state.
#{
@volunteer
.
state
}
"
)
-
if
@volunteer
.
rejected?
tr
td
=
t_attr
(
:rejection_type
)
td
=
t
(
"rejection_type.
#{
@volunteer
.
rejection_type
}
"
)
if
@volunteer
.
rejection_type
.
present?
tr
td
=
t_attr
(
:rejection_text
)
td
=
@volunteer
.
rejection_text
-
if
@volunteer
.
internal?
tr
td
=
t_attr
(
:bank_details
)
...
...
test/system/volunteers_test.rb
View file @
e230b14e
...
...
@@ -138,8 +138,8 @@ class VolunteersTest < ApplicationSystemTestCase
click_button
'Update Volunteer'
visit
volunteer_path
(
volunteer
)
assert
page
.
has_content?
'Reason for rejection Other'
assert
page
.
has_content?
'Explanation for rejection Explanation'
assert
page
.
has_content?
'Reason for rejection
:
Other'
assert
page
.
has_content?
'Explanation for rejection
:
Explanation'
end
test
'thead acceptance filter dropdown can switch to all'
do
...
...
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