new issue format

gitlabhq
1 parent 56d97618
Showing 8 changed files with 60 additions and 10 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/controllers/issues_controller.rb
app/views/issues/_show.html.haml
app/views/issues/show.html.haml
db/migrate/20111027152724_issue_conten_to_note.rb
db/schema.rb
spec/factories.rb
spec/requests/issues_spec.rb
@@ -662,6 +662,10 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
     background: #4466cc;
     color:white;
   }
+  &.normal {
+    background: #2c5ca6;
+    color:white;
+  }
   &.notes {
     background: #2c5c66;
     color:white;
@@ -34,7 +34,7 @@ class IssuesController &lt; ApplicationController
   end
   def show
-    @notes = @issue.notes
+    @notes = @issue.notes.order("created_at ASC")
     @note = @project.notes.new(:noteable => @issue)
   end
@@ -7,7 +7,7 @@
     = truncate issue.assignee.name, :lenght => 20
   %td ##{issue.id}
   %td
-    = truncate(html_escape(issue.title), :length => 50)
+    = truncate(html_escape(issue.title), :length => 60)
     %br
     - if issue.critical
       %span.tag.high critical
 %h2
-  = "Issue ##{@issue.id} - #{truncate @issue.title, :length => 50}"
-
+  = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
 .span-15
   -#= simple_format html_escape(@issue.content)
   .issue_notes= render "notes/notes"
@@ -29,6 +28,16 @@
       %td
         = image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
         = @issue.assignee.name
+    %tr 
+      %td Tags
+      %td
+        - if @issue.critical
+          %span.tag.high critical
+        - else 
+          %span.tag.normal normal
+
+        - if @issue.today?
+          %span.tag.today today
     %tr
       %td Closed?
       %td
 class IssueContenToNote < ActiveRecord::Migration
   def up
-    raise "Not ready"
+    puts "Issue content is deprecated -> move to notes"
     Issue.find_each(:batch_size => 100) do |issue|
-      
+      next if issue.content.blank?
+      note = Note.new(
+        :note => issue.content,
+        :project_id => issue.project_id,
+        :noteable => issue,
+        :created_at => issue.created_at,
+        :updated_at => issue.created_at
+      )
+      note.author_id = issue.author_id
+
+      if note.save
+        issue.update_attributes(:content => nil)
+        print "."
+      else 
+        print "F"
+      end
+    end
+
+    total = Issue.where("content is not null").count
+
+    if total > 0 
+      puts "content of #{total} issues were not migrated" 
+    else 
+      puts "Done"
     end
   end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20111027142641) do
+ActiveRecord::Schema.define(:version => 20111027152724) do
   create_table "issues", :force => true do |t|
     t.string   "title"
@@ -32,7 +32,6 @@ end
 Factory.add(:issue, Issue) do |obj|
   obj.title = Faker::Lorem.sentence
-  obj.content = Faker::Lorem.sentences
 end
 Factory.add(:snippet, Snippet) do |obj|
@@ -80,7 +80,6 @@ describe &quot;Issues&quot; do
     describe "fill in" do
       before do
         fill_in "issue_title", :with => "bug 345"
-        fill_in "issue_content", :with => "app bug 345"
         click_link "Select user"
         click_link @user.name
       end
@@ -112,6 +111,23 @@ describe &quot;Issues&quot; do
     end
   end
+  describe "Show issue" do 
+    before do
+      @issue = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => project
+
+      visit project_issue_path(project, @issue)
+    end
+
+    it "should have valid show page for issue" do
+      page.should have_content @issue.title
+      page.should have_content @user.name
+      page.should have_content "today"
+    end
+  end
+
   describe "Edit issue", :js => true do
     before do
       @issue = Factory :issue,
@@ -129,7 +145,6 @@ describe &quot;Issues&quot; do
     describe "fill in" do
       before do
         fill_in "issue_title", :with => "bug 345"
-        fill_in "issue_content", :with => "app bug 345"
       end
       it { expect { click_button "Save" }.to_not change {Issue.count} }
	@@ -34,7 +34,7 @@ class IssuesController < ApplicationController		@@ -34,7 +34,7 @@ class IssuesController < ApplicationController
34	end	34	end
35		35
36	def show	36	def show
37	- @notes = @issue.notes	37	+ @notes = @issue.notes.order("created_at ASC")
38	@note = @project.notes.new(:noteable => @issue)	38	@note = @project.notes.new(:noteable => @issue)
39	end	39	end
40		40
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	= truncate issue.assignee.name, :lenght => 20	7	= truncate issue.assignee.name, :lenght => 20
8	%td ##{issue.id}	8	%td ##{issue.id}
9	%td	9	%td
10	- = truncate(html_escape(issue.title), :length => 50)	10	+ = truncate(html_escape(issue.title), :length => 60)
11	%br	11	%br
12	- if issue.critical	12	- if issue.critical
13	%span.tag.high critical	13	%span.tag.high critical
1	class IssueContenToNote < ActiveRecord::Migration	1	class IssueContenToNote < ActiveRecord::Migration
2	def up	2	def up
3	- raise "Not ready"	3	+ puts "Issue content is deprecated -> move to notes"
4	Issue.find_each(:batch_size => 100) do \|issue\|	4	Issue.find_each(:batch_size => 100) do \|issue\|
5	-	5	+ next if issue.content.blank?
		6	+ note = Note.new(
		7	+ :note => issue.content,
		8	+ :project_id => issue.project_id,
		9	+ :noteable => issue,
		10	+ :created_at => issue.created_at,
		11	+ :updated_at => issue.created_at
		12	+ )
		13	+ note.author_id = issue.author_id
		14	+
		15	+ if note.save
		16	+ issue.update_attributes(:content => nil)
		17	+ print "."
		18	+ else
		19	+ print "F"
		20	+ end
		21	+ end
		22	+
		23	+ total = Issue.where("content is not null").count
		24	+
		25	+ if total > 0
		26	+ puts "content of #{total} issues were not migrated"
		27	+ else
		28	+ puts "Done"
6	end	29	end
7	end	30	end
8		31
	@@ -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 => 20111027142641) do	14	+ActiveRecord::Schema.define(:version => 20111027152724) do
15		15
16	create_table "issues", :force => true do \|t\|	16	create_table "issues", :force => true do \|t\|
17	t.string "title"	17	t.string "title"
	@@ -32,7 +32,6 @@ end		@@ -32,7 +32,6 @@ end
32		32
33	Factory.add(:issue, Issue) do \|obj\|	33	Factory.add(:issue, Issue) do \|obj\|
34	obj.title = Faker::Lorem.sentence	34	obj.title = Faker::Lorem.sentence
35	- obj.content = Faker::Lorem.sentences
36	end	35	end
37		36
38	Factory.add(:snippet, Snippet) do \|obj\|	37	Factory.add(:snippet, Snippet) do \|obj\|