Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
08e9bf8236e5
Commit
7ac62388
authored
Mar 12, 2015
by
Dmitriy Zaporozhets
Browse files
Prevent database query each time we render group avatar
parent
c556dca74e62
Changes
8
Hide whitespace changes
Inline
Side-by-side
app/helpers/application_helper.rb
View file @
08e9bf82
...
...
@@ -86,15 +86,6 @@ def project_identicon(project, options = {})
end
end
def
group_icon
(
group_path
)
group
=
Group
.
find_by
(
path:
group_path
)
if
group
&&
group
.
avatar
.
present?
group
.
avatar
.
url
else
image_path
(
'no_group_avatar.png'
)
end
end
def
avatar_icon
(
user_email
=
''
,
size
=
nil
)
user
=
User
.
find_by
(
email:
user_email
)
...
...
app/helpers/groups_helper.rb
View file @
08e9bf82
...
...
@@ -40,4 +40,16 @@ def group_settings_page?
false
end
end
def
group_icon
(
group
)
if
group
.
is_a?
(
String
)
group
=
Group
.
find_by
(
path:
group
)
end
if
group
&&
group
.
avatar
.
present?
group
.
avatar
.
url
else
image_path
(
'no_group_avatar.png'
)
end
end
end
app/helpers/namespaces_helper.rb
View file @
08e9bf82
...
...
@@ -28,7 +28,7 @@ def namespace_select_tag(id, opts = {})
def
namespace_icon
(
namespace
,
size
=
40
)
if
namespace
.
kind_of?
(
Group
)
group_icon
(
namespace
.
path
)
group_icon
(
namespace
)
else
avatar_icon
(
namespace
.
owner
.
email
,
size
)
end
...
...
app/views/admin/groups/show.html.haml
View file @
08e9bf82
...
...
@@ -12,7 +12,7 @@
Group info:
%ul
.well-list
%li
=
image_tag
group_icon
(
@group
.
path
),
class:
"avatar s60"
=
image_tag
group_icon
(
@group
),
class:
"avatar s60"
%li
%span
.light
Name:
%strong
=
@group
.
name
...
...
app/views/dashboard/groups/index.html.haml
View file @
08e9bf82
...
...
@@ -27,7 +27,7 @@
%i
.fa.fa-sign-out
Leave
=
image_tag
group_icon
(
group
.
path
),
class:
"avatar s40 avatar-tile"
=
image_tag
group_icon
(
group
),
class:
"avatar s40 avatar-tile"
=
link_to
group
,
class:
'group-name'
do
%strong
=
group
.
name
...
...
app/views/groups/edit.html.haml
View file @
08e9bf82
...
...
@@ -12,7 +12,7 @@
.form-group
.col-sm-2
.col-sm-10
=
image_tag
group_icon
(
@group
.
to_param
),
alt:
''
,
class:
'avatar group-avatar s160'
=
image_tag
group_icon
(
@group
),
alt:
''
,
class:
'avatar group-avatar s160'
%p
.light
-
if
@group
.
avatar?
You can change your group avatar here
...
...
app/views/groups/show.html.haml
View file @
08e9bf82
.dashboard
%div
=
image_tag
group_icon
(
@group
.
path
),
class:
"avatar group-avatar s90"
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s90"
.clearfix
%h2
=
@group
.
name
...
...
app/views/users/_groups.html.haml
View file @
08e9bf82
.clearfix
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars inline'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
.
path
),
class:
'avatar group-avatar s40'
=
image_tag
group_icon
(
group
),
class:
'avatar group-avatar s40'
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