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
ed78a1f2
Commit
ed78a1f2
authored
Dec 14, 2017
by
Tugce Nur Tas
Committed by
Tuğçe Nur Taş
Dec 20, 2017
Browse files
review changes
parent
1967a485
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/views/clients/show.html.slim
View file @
ed78a1f2
...
...
@@ -65,7 +65,7 @@ h1= @client.contact.full_name
tr
td
=
t
(
'registered_by'
)
td
=
link_to
@client
.
user
.
full_name
,
profile_path
(
@client
.
user
)
td
=
link_to
@client
.
user
.
full_name
if
@client
.
user
.
profile
.
present?
,
profile_path
(
@client
.
user
.
profile
)
-
if
policy
(
Client
).
comments?
tr
...
...
app/views/volunteers/_volunteer.html.slim
View file @
ed78a1f2
...
...
@@ -18,8 +18,8 @@ tr
-
if
volunteer
.
self_applicant?
td
=
t
(
'volunteer_self_applicant'
)
-
else
td
=
link_to
volunteer
.
registrar
.
full_name
,
profile_path
(
volunteer
.
registrar
)
-
if
action_
name
==
'
index
'
td
=
link_to
volunteer
.
registrar
.
full_name
,
profile_path
(
volunteer
.
registrar
.
profile
)
-
if
action_index
?
=
render
'index_actions'
,
subject:
volunteer
-
if
volunteer
.
seeking_clients?
td
=
button_link
t
(
'find_client'
),
find_client_volunteer_path
(
id:
volunteer
)
...
...
app/views/volunteers/show.html.slim
View file @
ed78a1f2
...
...
@@ -124,12 +124,13 @@ h3 Persönlicher Hintergrund
tr
td
#{
t_attr
(
:external
)
}
/
#{
t_attr
(
:internal
)
}
td
=
@volunteer
.
external?
?
t_attr
(
:external
)
:
t_attr
(
:internal
)
tr
td
=
t
(
'registered_by'
)
tr
td
=
t
(
'registered_by'
)
td
-
if
@volunteer
.
self_applicant?
td
=
t
(
'volunteer_self_applicant'
)
=
t
(
'volunteer_self_applicant'
)
-
else
td
=
link_to
@volunteer
.
registrar
.
full_name
,
profile_path
(
@volunteer
.
registrar
)
=
link_to
@volunteer
.
registrar
.
full_name
,
profile_path
(
@volunteer
.
registrar
)
h3
=
t_attr
(
:single_accompaniment
)
.table-responsive
...
...
test/system/clients_test.rb
View file @
ed78a1f2
...
...
@@ -56,7 +56,7 @@ class ClientsTest < ApplicationSystemTestCase
assert
page
.
has_text?
'Client was successfully created.'
@superadmin
.
clients
.
each
do
|
client
|
assert
page
.
has_link?
client
.
user
.
full_name
,
href:
profile_path
(
client
.
user
)
assert
page
.
has_link?
client
.
user
.
full_name
,
href:
profile_path
(
client
.
user
.
profile
)
assert
page
.
has_link?
client
.
contact
.
primary_email
end
end
...
...
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