Merge branch 'new_issue' into dev

gitlabhq
2 parents 89fa800e a0171813
Showing 12 changed files with 84 additions and 18 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/controllers/issues_controller.rb
app/models/issue.rb
app/views/issues/_form.html.haml
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/issues/show.html.haml
app/views/issues/update.js.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
@@ -14,9 +14,9 @@ class Issue &lt; ActiveRecord::Base
             :presence => true,
             :length   => { :within => 0..255 }
-  validates :content,
-            :presence => true,
-            :length   => { :within => 0..2000 }
+  #validates :content,
+            #:presence => true,
+            #:length   => { :within => 0..2000 }
   scope :critical, where(:critical => true)
   scope :non_critical, where(:critical => false)
@@ -7,10 +7,10 @@
     .span-8
       = f.label :title
-      = f.text_field :title, :style => "width:450px"
-    .span-8
-      = f.label :content
-      = f.text_area :content, :style => "width:450px; height:130px"
+      = f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
+    -#.span-8
+      -#= f.label :content
+      -#= f.text_area :content, :style => "width:450px; height:130px"
     .span-8.append-bottom
       = f.label :assignee_id
       = f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
@@ -7,7 +7,7 @@
     = truncate issue.assignee.name, :lenght => 20
   %td ##{issue.id}
   %td
-    = html_escape issue.title
+    = truncate(html_escape(issue.title), :length => 60)
     %br
     - if issue.critical
       %span.tag.high critical
@@ -45,7 +45,7 @@
   });
   $('.delete-issue').live('ajax:success', function() {
-    $(this).closest('tr').fadeOut(); });
+    $(this).closest('tr').fadeOut(); updatePage();});
   function setSortable(){
     $('#issues-table>tbody').sortable({
 %h2
-  = "Issue ##{@issue.id} - #{@issue.title}"
-
+  = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
 .span-15
-  = simple_format html_escape(@issue.content)
+  -#= simple_format html_escape(@issue.content)
   .issue_notes= render "notes/notes"
 .span-8.right
   .span-8
@@ -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
@@ -39,5 +48,10 @@
         - else
           = check_box_tag "closed", 1, @issue.closed, :disabled => true
+
+  - if can?(current_user, :admin_issue, @issue)
+    .clear
+      = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true
+      .right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete,  :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
 .clear
@@ -6,7 +6,7 @@
   - if @issue.valid?
     :plain
       $("#edit_issue_dialog").dialog("close");
-      $.ajax({type: "GET", url: location.href, dataType: "script"});
+      updatePage();
   - else
     :plain
       $("#edit_issue_dialog").empty();
@@ -0,0 +1,34 @@
+class IssueContenToNote < ActiveRecord::Migration
+  def up
+    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
+
+  def down
+  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	- = html_escape issue.title	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
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	});	45	});
46		46
47	$('.delete-issue').live('ajax:success', function() {	47	$('.delete-issue').live('ajax:success', function() {
48	- $(this).closest('tr').fadeOut(); });	48	+ $(this).closest('tr').fadeOut(); updatePage();});
49		49
50	function setSortable(){	50	function setSortable(){
51	$('#issues-table>tbody').sortable({	51	$('#issues-table>tbody').sortable({
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	- if @issue.valid?	6	- if @issue.valid?
7	:plain	7	:plain
8	$("#edit_issue_dialog").dialog("close");	8	$("#edit_issue_dialog").dialog("close");
9	- $.ajax({type: "GET", url: location.href, dataType: "script"});	9	+ updatePage();
10	- else	10	- else
11	:plain	11	:plain
12	$("#edit_issue_dialog").empty();	12	$("#edit_issue_dialog").empty();
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+class IssueContenToNote < ActiveRecord::Migration
	2	+ def up
	3	+ puts "Issue content is deprecated -> move to notes"
	4	+ Issue.find_each(:batch_size => 100) do \|issue\|
	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"
	29	+ end
	30	+ end
	31	+
	32	+ def down
	33	+ end
	34	+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 => 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\|