Download as
Browse Code »

Commit 50fdb2e7dffd80265bc604ec8f9071e12f99af30

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

Remove critical status from Issue. Move sort instead

Showing 12 changed files with 30 additions and 65 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @50fdb2e
@@ -622,10 +622,6 @@ li.note { @@ -622,10 +622,6 @@ li.note {
622 margin-right:5px; 622 margin-right:5px;
623 margin-top: 2px; 623 margin-top: 2px;
624 @include border-radius(4px); 624 @include border-radius(4px);
625 - &.critical {  
626 - background: #EAA;  
627 - border:1px solid #B88;  
628 - }  
629 &.today{ 625 &.today{
630 background: #ADA; 626 background: #ADA;
631 border:1px solid #8B8; 627 border:1px solid #8B8;
@@ -664,14 +660,6 @@ li.note { @@ -664,14 +660,6 @@ li.note {
664 } 660 }
665 } 661 }
666 662
667 - &.critical {  
668 - background: #FEE;  
669 - border-color:#ECC;  
670 - .icon {  
671 - background: #EAA;  
672 - border:1px solid #B88;  
673 - }  
674 - }  
675 &.today{ 663 &.today{
676 background: #EFE; 664 background: #EFE;
677 border-color:#CEC; 665 border-color:#CEC;
app/controllers/issues_controller.rb
  Diff comments   View file @50fdb2e
@@ -140,7 +140,7 @@ class IssuesController < ApplicationController @@ -140,7 +140,7 @@ class IssuesController < ApplicationController
140 @issues = @issues.where(:assignee_id => params[:assignee_id]) if params[:assignee_id].present? 140 @issues = @issues.where(:assignee_id => params[:assignee_id]) if params[:assignee_id].present?
141 @issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present? 141 @issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present?
142 @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present? 142 @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
143 - @issues = @issues.includes(:author, :project).order("critical, updated_at") 143 + @issues = @issues.includes(:author, :project).order("updated_at")
144 @issues 144 @issues
145 end 145 end
146 end 146 end
app/controllers/merge_requests_controller.rb
  Diff comments   View file @50fdb2e
@@ -30,7 +30,7 @@ class MergeRequestsController < ApplicationController @@ -30,7 +30,7 @@ class MergeRequestsController < ApplicationController
30 else @merge_requests.opened 30 else @merge_requests.opened
31 end.page(params[:page]).per(20) 31 end.page(params[:page]).per(20)
32 32
33 - @merge_requests = @merge_requests.includes(:author, :project).order("created_at desc") 33 + @merge_requests = @merge_requests.includes(:author, :project).order("closed, created_at desc")
34 end 34 end
35 35
36 def show 36 def show
app/helpers/issues_helper.rb
  Diff comments   View file @50fdb2e
@@ -28,7 +28,6 @@ module IssuesHelper @@ -28,7 +28,6 @@ module IssuesHelper
28 28
29 def issue_css_classes issue 29 def issue_css_classes issue
30 classes = "issue" 30 classes = "issue"
31 - classes << " critical" if issue.critical  
32 classes << " closed" if issue.closed 31 classes << " closed" if issue.closed
33 classes << " today" if issue.today? 32 classes << " today" if issue.today?
34 classes 33 classes
app/models/issue.rb
  Diff comments   View file @50fdb2e
@@ -33,9 +33,6 @@ class Issue &lt; ActiveRecord::Base @@ -33,9 +33,6 @@ class Issue &lt; ActiveRecord::Base
33 validates :description, 33 validates :description,
34 :length => { :within => 0..2000 } 34 :length => { :within => 0..2000 }
35 35
36 - scope :critical, where(:critical => true)  
37 - scope :non_critical, where(:critical => false)  
38 -  
39 scope :opened, where(:closed => false) 36 scope :opened, where(:closed => false)
40 scope :closed, where(:closed => true) 37 scope :closed, where(:closed => true)
41 scope :assigned, lambda { |u| where(:assignee_id => u.id)} 38 scope :assigned, lambda { |u| where(:assignee_id => u.id)}
app/models/project.rb
  Diff comments   View file @50fdb2e
@@ -13,7 +13,7 @@ class Project &lt; ActiveRecord::Base @@ -13,7 +13,7 @@ class Project &lt; ActiveRecord::Base
13 has_many :users, :through => :users_projects 13 has_many :users, :through => :users_projects
14 has_many :events, :dependent => :destroy 14 has_many :events, :dependent => :destroy
15 has_many :merge_requests, :dependent => :destroy 15 has_many :merge_requests, :dependent => :destroy
16 - has_many :issues, :dependent => :destroy, :order => "position" 16 + has_many :issues, :dependent => :destroy, :order => "closed, position"
17 has_many :milestones, :dependent => :destroy 17 has_many :milestones, :dependent => :destroy
18 has_many :users_projects, :dependent => :destroy 18 has_many :users_projects, :dependent => :destroy
19 has_many :notes, :dependent => :destroy 19 has_many :notes, :dependent => :destroy
app/views/dashboard/issues.html.haml
  Diff comments   View file @50fdb2e
@@ -3,15 +3,6 @@ @@ -3,15 +3,6 @@
3 %small (assigned to you) 3 %small (assigned to you)
4 %small.right #{@issues.total_count} issues 4 %small.right #{@issues.total_count} issues
5 5
6 -%br  
7 -.issues_legend  
8 - .list_legend  
9 - .icon.critical  
10 - .text Critical  
11 -  
12 - .list_legend  
13 - .icon.today  
14 - .text Today  
15 .clearfix 6 .clearfix
16 - if @issues.any? 7 - if @issues.any?
17 - @issues.group_by(&:project).each do |group| 8 - @issues.group_by(&:project).each do |group|
app/views/issues/_form.html.haml
  Diff comments   View file @50fdb2e
@@ -9,37 +9,37 @@ @@ -9,37 +9,37 @@
9 .issue_form_box 9 .issue_form_box
10 .issue_title 10 .issue_title
11 .clearfix 11 .clearfix
12 - = f.label :title, "Issue Subject *" 12 + = f.label :title do
  13 + %strong= "Subject *"
13 .input 14 .input
14 = f.text_field :title, :maxlength => 255, :class => "xxlarge" 15 = f.text_field :title, :maxlength => 255, :class => "xxlarge"
15 .issue_middle_block 16 .issue_middle_block
16 .issue_assignee 17 .issue_assignee
17 - = f.label :assignee_id, "Assign to"  
18 - .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Assign to user" }) 18 + = f.label :assignee_id do
  19 + %i.icon-user
  20 + Assign to
  21 + .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select a user" })
19 .issue_milestone 22 .issue_milestone
20 - = f.label :milestone_id 23 + = f.label :milestone_id do
  24 + %i.icon-time
  25 + Milestone
21 .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { :include_blank => "Select milestone" }) 26 .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { :include_blank => "Select milestone" })
22 27
23 .issue_description 28 .issue_description
24 .clearfix 29 .clearfix
25 - = f.label :critical, "Critical"  
26 - .input= f.check_box :critical 30 + = f.label :label_list do
  31 + %i.icon-tag
  32 + Labels
  33 + .input
  34 + = f.text_field :label_list, :maxlength => 2000, :class => "xxlarge"
  35 + %p.hint Separate with comma.
27 36
28 - - unless @issue.new_record?  
29 - .clearfix  
30 - = f.label :closed  
31 - .input= f.check_box :closed  
32 .clearfix 37 .clearfix
33 - = f.label :description, "Issue Details" 38 + = f.label :description, "Details"
34 .input 39 .input
35 = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14 40 = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
36 %p.hint Markdown is enabled. 41 %p.hint Markdown is enabled.
37 42
38 - .clearfix  
39 - = f.label :label_list, "Labels"  
40 - .input  
41 - = f.text_field :label_list, :maxlength => 2000, :class => "xxlarge"  
42 - %p.hint Separate with comma.  
43 43
44 .actions 44 .actions
45 - if @issue.new_record? 45 - if @issue.new_record?
app/views/issues/_issues.html.haml
  Diff comments   View file @50fdb2e
1 -- @issues.select(&:critical).each do |issue|  
2 - = render(:partial => 'issues/show', :locals => {:issue => issue})  
3 -  
4 -- @issues.reject(&:critical).each do |issue| 1 +- @issues.each do |issue|
5 = render(:partial => 'issues/show', :locals => {:issue => issue}) 2 = render(:partial => 'issues/show', :locals => {:issue => issue})
6 3
7 - if @issues.present? 4 - if @issues.present?
app/views/issues/index.html.haml
  Diff comments   View file @50fdb2e
@@ -13,22 +13,7 @@ @@ -13,22 +13,7 @@
13 = hidden_field_tag :status, params[:f] 13 = hidden_field_tag :status, params[:f]
14 = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' } 14 = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' }
15 15
16 - %br  
17 -  
18 - .issues_legend  
19 - .list_legend  
20 - .icon.today  
21 - .text Today  
22 -  
23 - .list_legend  
24 - .icon.critical  
25 - .text Critical  
26 -  
27 - .list_legend  
28 - .icon.closed  
29 - .text Closed  
30 .clearfix 16 .clearfix
31 -  
32 %div#issues-table-holder.ui-box 17 %div#issues-table-holder.ui-box
33 .title 18 .title
34 .left 19 .left
db/migrate/20120627145613_remove_critical_from_issue.rb 0 → 100644
  Diff comments   View file @50fdb2e
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class RemoveCriticalFromIssue < ActiveRecord::Migration
  2 + def up
  3 + remove_column :issues, :critical
  4 + end
  5 +
  6 + def down
  7 + add_column :issues, :critical, :boolean, :null => true, :default => false
  8 + end
  9 +end
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # 11 #
12 # It's strongly recommended to check this file into your version control system. 12 # It's strongly recommended to check this file into your version control system.
13 13
14 -ActiveRecord::Schema.define(:version => 20120413135904) do 14 +ActiveRecord::Schema.define(:version => 20120627145613) do
15 15
16 create_table "events", :force => true do |t| 16 create_table "events", :force => true do |t|
17 t.string "target_type" 17 t.string "target_type"
@@ -34,7 +34,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120413135904) do @@ -34,7 +34,6 @@ ActiveRecord::Schema.define(:version =&gt; 20120413135904) do
34 t.datetime "updated_at", :null => false 34 t.datetime "updated_at", :null => false
35 t.boolean "closed", :default => false, :null => false 35 t.boolean "closed", :default => false, :null => false
36 t.integer "position", :default => 0 36 t.integer "position", :default => 0
37 - t.boolean "critical", :default => false, :null => false  
38 t.string "branch_name" 37 t.string "branch_name"
39 t.text "description" 38 t.text "description"
40 t.integer "milestone_id" 39 t.integer "milestone_id"