Commit 98b7717df7e455b745c47582dcd5718f2ab904a2
1 parent
568ce1ed
Exists in
master
and in
4 other branches
Remove user decorator
Showing
8 changed files
with
10 additions
and
32 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -111,22 +111,10 @@ span.update-author { | @@ -111,22 +111,10 @@ span.update-author { | ||
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | .label { | 113 | .label { |
| 114 | - padding: 0px 4px; | ||
| 115 | - font-size: 10px; | 114 | + padding: 1px 4px; |
| 115 | + font-size: 12px; | ||
| 116 | font-style: normal; | 116 | font-style: normal; |
| 117 | - background-color: $link_color; | ||
| 118 | - | ||
| 119 | - &.label-success { | ||
| 120 | - background-color: #8D8; | ||
| 121 | - color: #333; | ||
| 122 | - text-shadow: 0 1px 1px white; | ||
| 123 | - } | ||
| 124 | - | ||
| 125 | - &.label-error { | ||
| 126 | - background-color: #D88; | ||
| 127 | - color: #333; | ||
| 128 | - text-shadow: 0 1px 1px white; | ||
| 129 | - } | 117 | + font-weight: normal; |
| 130 | } | 118 | } |
| 131 | 119 | ||
| 132 | form { | 120 | form { |
app/controllers/admin/teams/members_controller.rb
| 1 | class Admin::Teams::MembersController < Admin::Teams::ApplicationController | 1 | class Admin::Teams::MembersController < Admin::Teams::ApplicationController |
| 2 | def new | 2 | def new |
| 3 | @users = User.potential_team_members(user_team) | 3 | @users = User.potential_team_members(user_team) |
| 4 | - @users = UserDecorator.decorate_collection @users | ||
| 5 | end | 4 | end |
| 6 | 5 | ||
| 7 | def create | 6 | def create |
app/controllers/milestones_controller.rb
| @@ -32,7 +32,7 @@ class MilestonesController < ProjectResourceController | @@ -32,7 +32,7 @@ class MilestonesController < ProjectResourceController | ||
| 32 | 32 | ||
| 33 | def show | 33 | def show |
| 34 | @issues = @milestone.issues | 34 | @issues = @milestone.issues |
| 35 | - @users = UserDecorator.decorate_collection(@milestone.participants) | 35 | + @users = @milestone.participants |
| 36 | @merge_requests = @milestone.merge_requests | 36 | @merge_requests = @milestone.merge_requests |
| 37 | 37 | ||
| 38 | respond_to do |format| | 38 | respond_to do |format| |
app/controllers/teams/members_controller.rb
| @@ -8,7 +8,6 @@ class Teams::MembersController < Teams::ApplicationController | @@ -8,7 +8,6 @@ class Teams::MembersController < Teams::ApplicationController | ||
| 8 | 8 | ||
| 9 | def new | 9 | def new |
| 10 | @users = User.potential_team_members(user_team) | 10 | @users = User.potential_team_members(user_team) |
| 11 | - @users = UserDecorator.decorate_collection @users | ||
| 12 | end | 11 | end |
| 13 | 12 | ||
| 14 | def create | 13 | def create |
app/decorators/user_decorator.rb
| @@ -1,11 +0,0 @@ | @@ -1,11 +0,0 @@ | ||
| 1 | -class UserDecorator < ApplicationDecorator | ||
| 2 | - decorates :user | ||
| 3 | - | ||
| 4 | - def avatar_image size = 16 | ||
| 5 | - h.image_tag h.gravatar_icon(self.email, size), class: "avatar #{"s#{size}"}", width: size | ||
| 6 | - end | ||
| 7 | - | ||
| 8 | - def tm_of(project) | ||
| 9 | - project.team_member_by_id(self.id) | ||
| 10 | - end | ||
| 11 | -end |
app/models/user.rb
| @@ -373,4 +373,8 @@ class User < ActiveRecord::Base | @@ -373,4 +373,8 @@ class User < ActiveRecord::Base | ||
| 373 | def name_with_username | 373 | def name_with_username |
| 374 | "#{name} (#{username})" | 374 | "#{name} (#{username})" |
| 375 | end | 375 | end |
| 376 | + | ||
| 377 | + def tm_of(project) | ||
| 378 | + project.team_member_by_id(self.id) | ||
| 379 | + end | ||
| 376 | end | 380 | end |
app/views/issues/_issue.html.haml
| @@ -34,6 +34,6 @@ | @@ -34,6 +34,6 @@ | ||
| 34 | = render 'votes/votes_inline', votable: issue | 34 | = render 'votes/votes_inline', votable: issue |
| 35 | %span | 35 | %span |
| 36 | - issue.labels.each do |label| | 36 | - issue.labels.each do |label| |
| 37 | - %span.label | 37 | + %span.label.label-info |
| 38 | %i.icon-tag | 38 | %i.icon-tag |
| 39 | = label.name | 39 | = label.name |
app/views/milestones/show.html.haml
| @@ -88,7 +88,6 @@ | @@ -88,7 +88,6 @@ | ||
| 88 | %div | 88 | %div |
| 89 | - @users.each do |user| | 89 | - @users.each do |user| |
| 90 | = link_to user, class: 'float-link' do | 90 | = link_to user, class: 'float-link' do |
| 91 | - = user.avatar_image | ||
| 92 | - = user.name | 91 | + = link_to_member(@project, user) |
| 93 | 92 | ||
| 94 | .clearfix | 93 | .clearfix |