Download as
Browse Code »

Commit 98b7717df7e455b745c47582dcd5718f2ab904a2

Authored by Dmitriy Zaporozhets
1 parent 568ce1ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove user decorator

Showing 8 changed files with 10 additions and 32 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @98b7717
... ... @@ -111,22 +111,10 @@ span.update-author {
111 111 }
112 112  
113 113 .label {
114   - padding: 0px 4px;
115   - font-size: 10px;
  114 + padding: 1px 4px;
  115 + font-size: 12px;
116 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 120 form {
... ...
app/controllers/admin/teams/members_controller.rb
  Diff comments   View file @98b7717
1 1 class Admin::Teams::MembersController < Admin::Teams::ApplicationController
2 2 def new
3 3 @users = User.potential_team_members(user_team)
4   - @users = UserDecorator.decorate_collection @users
5 4 end
6 5  
7 6 def create
... ...
app/controllers/milestones_controller.rb
  Diff comments   View file @98b7717
... ... @@ -32,7 +32,7 @@ class MilestonesController &lt; ProjectResourceController
32 32  
33 33 def show
34 34 @issues = @milestone.issues
35   - @users = UserDecorator.decorate_collection(@milestone.participants)
  35 + @users = @milestone.participants
36 36 @merge_requests = @milestone.merge_requests
37 37  
38 38 respond_to do |format|
... ...
app/controllers/teams/members_controller.rb
  Diff comments   View file @98b7717
... ... @@ -8,7 +8,6 @@ class Teams::MembersController &lt; Teams::ApplicationController
8 8  
9 9 def new
10 10 @users = User.potential_team_members(user_team)
11   - @users = UserDecorator.decorate_collection @users
12 11 end
13 12  
14 13 def create
... ...
app/decorators/user_decorator.rb
View file @568ce1e
... ... @@ -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
  Diff comments   View file @98b7717
... ... @@ -373,4 +373,8 @@ class User &lt; ActiveRecord::Base
373 373 def name_with_username
374 374 "#{name} (#{username})"
375 375 end
  376 +
  377 + def tm_of(project)
  378 + project.team_member_by_id(self.id)
  379 + end
376 380 end
... ...
app/views/issues/_issue.html.haml
  Diff comments   View file @98b7717
... ... @@ -34,6 +34,6 @@
34 34 = render 'votes/votes_inline', votable: issue
35 35 %span
36 36 - issue.labels.each do |label|
37   - %span.label
  37 + %span.label.label-info
38 38 %i.icon-tag
39 39 = label.name
... ...
app/views/milestones/show.html.haml
  Diff comments   View file @98b7717
... ... @@ -88,7 +88,6 @@
88 88 %div
89 89 - @users.each do |user|
90 90 = link_to user, class: 'float-link' do
91   - = user.avatar_image
92   - = user.name
  91 + = link_to_member(@project, user)
93 92  
94 93 .clearfix
... ...