Sortable issues

VSizov
1 parent 4e063dea
Showing 16 changed files with 59 additions and 16 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/issues.js.coffee
app/assets/javascripts/profile.js.coffee
app/assets/javascripts/projects.js
app/assets/stylesheets/projects.css.scss
app/controllers/issues_controller.rb
app/models/issue.rb
app/models/project.rb
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/issues/index.js.haml
config/initializers/rails_footnotes.rb
config/routes.rb
db/schema.rb
@@ -19,6 +19,7 @@ gem &quot;albino&quot;, :git =&gt; &quot;git://github.com/gitlabhq/albino.git&quot;
 gem "kaminari"
 gem "thin"
 gem "git"
+gem "acts_as_list"
 group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
@@ -61,6 +61,7 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
+    acts_as_list (0.1.4)
     addressable (2.2.6)
     ansi (1.3.0)
     archive-tar-minitar (0.5.2)
@@ -240,6 +241,7 @@ PLATFORMS
   ruby
 DEPENDENCIES
+  acts_as_list
   albino!
   annotate!
   autotest
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -34,6 +34,7 @@ $(document).ready(function(){
         e.preventDefault();
     }
   });
+
 });
 function focusSearch() {
@@ -539,3 +539,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
     float:left;
   }
 }
+
+.handle:hover{
+  cursor: move;
+}
@@ -69,4 +69,14 @@ class IssuesController &lt; ApplicationController
       format.js { render :nothing => true }  
     end
   end
+
+  def sort
+    @issues = @project.issues.all
+    @issues.each do |issue|
+      issue.position = params['issue'].index(issue.id.to_s) + 1
+      issue.save
+    end
+
+    render :nothing => true
+  end
 end
@@ -21,6 +21,8 @@ class Issue &lt; ActiveRecord::Base
   scope :opened, where(:closed => false)
   scope :closed, where(:closed => true)
   scope :assigned, lambda { |u| where(:assignee_id => u.id)}
+
+  acts_as_list
 end
 # == Schema Information
 #
@@ -3,7 +3,7 @@ require &quot;grit&quot;
 class Project < ActiveRecord::Base
   belongs_to :owner, :class_name => "User"
-  has_many :issues, :dependent => :destroy
+  has_many :issues, :dependent => :destroy, :order => "position"
   has_many :users_projects, :dependent => :destroy
   has_many :users, :through => :users_projects
   has_many :notes, :dependent => :destroy
 %tr{ :id => dom_id(issue), :class => "issue", :url => project_issue_path(@project, issue) }
   %td
-    = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
+    = image_tag gravatar_icon(issue.assignee.email), :class => ["left", "handle"], :width => 40, :style => "padding:0 5px;"
     = truncate issue.assignee.name, :lenght => 20
   %td ##{issue.id}
   %td= html_escape issue.title
@@ -22,3 +22,29 @@
 :javascript
   $('.delete-issue').live('ajax:success', function() {  
     $(this).closest('tr').fadeOut(); });  
+  
+  function setSortable(){
+    $('#issues-table>tbody').sortable({
+      axis: 'y',
+      dropOnEmpty: false,
+      handle: '.handle',
+      cursor: 'crosshair',
+      items: 'tr',
+      opacity: 0.4,
+      scroll: true,
+      update: function(){
+        $.ajax({
+        type: 'post',
+        data: $('#issues-table>tbody').sortable('serialize'),
+        dataType: 'script',
+        complete: function(request){
+          $('#issues-table>tbody').effect('highlight');
+        },
+        url: "#{sort_project_issues_path(@project)}"})
+        }
+      });
+  }
+
+  $(function(){
+    setSortable();
+  });
 :plain
   $('#issues-table-holder').html("#{escape_javascript(render('issues'))}");
+  setSortable();
-if defined?(Footnotes) && Rails.env.development?
-  Footnotes.run! # first of all
+#if defined?(Footnotes) && Rails.env.development?
+  #Footnotes.run! # first of all
   # ... other init code
-end
+#end
@@ -40,7 +40,11 @@ Gitlab::Application.routes.draw do
     end
     resources :commits
     resources :team_members
-    resources :issues
+    resources :issues do
+      collection do
+        post :sort
+      end
+    end
     resources :notes, :only => [:create, :destroy]
   end
   root :to => "projects#index"
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20111009111204) do
+ActiveRecord::Schema.define(:version => 20111015154310) do
   create_table "issues", :force => true do |t|
     t.string   "title"
@@ -22,6 +22,7 @@ ActiveRecord::Schema.define(:version =&gt; 20111009111204) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "closed",      :default => false, :null => false
+    t.integer  "position",    :default => 0
   end
   create_table "keys", :force => true do |t|
	@@ -19,6 +19,7 @@ gem "albino", :git => "git://github.com/gitlabhq/albino.git"		@@ -19,6 +19,7 @@ gem "albino", :git => "git://github.com/gitlabhq/albino.git"
19	gem "kaminari"	19	gem "kaminari"
20	gem "thin"	20	gem "thin"
21	gem "git"	21	gem "git"
		22	+gem "acts_as_list"
22		23
23	group :assets do	24	group :assets do
24	gem 'sass-rails', " ~> 3.1.0"	25	gem 'sass-rails', " ~> 3.1.0"
	@@ -61,6 +61,7 @@ GEM		@@ -61,6 +61,7 @@ GEM
61	activesupport (= 3.1.0)	61	activesupport (= 3.1.0)
62	activesupport (3.1.0)	62	activesupport (3.1.0)
63	multi_json (~> 1.0)	63	multi_json (~> 1.0)
		64	+ acts_as_list (0.1.4)
64	addressable (2.2.6)	65	addressable (2.2.6)
65	ansi (1.3.0)	66	ansi (1.3.0)
66	archive-tar-minitar (0.5.2)	67	archive-tar-minitar (0.5.2)
	@@ -240,6 +241,7 @@ PLATFORMS		@@ -240,6 +241,7 @@ PLATFORMS
240	ruby	241	ruby
241		242
242	DEPENDENCIES	243	DEPENDENCIES
		244	+ acts_as_list
243	albino!	245	albino!
244	annotate!	246	annotate!
245	autotest	247	autotest
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-# Place all the behaviors and hooks related to the matching controller here.
2	-# All this logic will automatically be available in application.js.
3	-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
	@@ -34,6 +34,7 @@ $(document).ready(function(){		@@ -34,6 +34,7 @@ $(document).ready(function(){
34	e.preventDefault();	34	e.preventDefault();
35	}	35	}
36	});	36	});
		37	+
37	});	38	});
38		39
39	function focusSearch() {	40	function focusSearch() {
	@@ -539,3 +539,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {		@@ -539,3 +539,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
539	float:left;	539	float:left;
540	}	540	}
541	}	541	}
		542	+
		543	+.handle:hover{
		544	+ cursor: move;
		545	+}
	@@ -69,4 +69,14 @@ class IssuesController < ApplicationController		@@ -69,4 +69,14 @@ class IssuesController < ApplicationController
69	format.js { render :nothing => true }	69	format.js { render :nothing => true }
70	end	70	end
71	end	71	end
		72	+
		73	+ def sort
		74	+ @issues = @project.issues.all
		75	+ @issues.each do \|issue\|
		76	+ issue.position = params['issue'].index(issue.id.to_s) + 1
		77	+ issue.save
		78	+ end
		79	+
		80	+ render :nothing => true
		81	+ end
72	end	82	end
	@@ -3,7 +3,7 @@ require "grit"		@@ -3,7 +3,7 @@ require "grit"
3	class Project < ActiveRecord::Base	3	class Project < ActiveRecord::Base
4	belongs_to :owner, :class_name => "User"	4	belongs_to :owner, :class_name => "User"
5		5
6	- has_many :issues, :dependent => :destroy	6	+ has_many :issues, :dependent => :destroy, :order => "position"
7	has_many :users_projects, :dependent => :destroy	7	has_many :users_projects, :dependent => :destroy
8	has_many :users, :through => :users_projects	8	has_many :users, :through => :users_projects
9	has_many :notes, :dependent => :destroy	9	has_many :notes, :dependent => :destroy
1	%tr{ :id => dom_id(issue), :class => "issue", :url => project_issue_path(@project, issue) }	1	%tr{ :id => dom_id(issue), :class => "issue", :url => project_issue_path(@project, issue) }
2	%td	2	%td
3	- = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"	3	+ = image_tag gravatar_icon(issue.assignee.email), :class => ["left", "handle"], :width => 40, :style => "padding:0 5px;"
4	= truncate issue.assignee.name, :lenght => 20	4	= truncate issue.assignee.name, :lenght => 20
5	%td ##{issue.id}	5	%td ##{issue.id}
6	%td= html_escape issue.title	6	%td= html_escape issue.title
	@@ -22,3 +22,29 @@		@@ -22,3 +22,29 @@
22	:javascript	22	:javascript
23	$('.delete-issue').live('ajax:success', function() {	23	$('.delete-issue').live('ajax:success', function() {
24	$(this).closest('tr').fadeOut(); });	24	$(this).closest('tr').fadeOut(); });
		25	+
		26	+ function setSortable(){
		27	+ $('#issues-table>tbody').sortable({
		28	+ axis: 'y',
		29	+ dropOnEmpty: false,
		30	+ handle: '.handle',
		31	+ cursor: 'crosshair',
		32	+ items: 'tr',
		33	+ opacity: 0.4,
		34	+ scroll: true,
		35	+ update: function(){
		36	+ $.ajax({
		37	+ type: 'post',
		38	+ data: $('#issues-table>tbody').sortable('serialize'),
		39	+ dataType: 'script',
		40	+ complete: function(request){
		41	+ $('#issues-table>tbody').effect('highlight');
		42	+ },
		43	+ url: "#{sort_project_issues_path(@project)}"})
		44	+ }
		45	+ });
		46	+ }
		47	+
		48	+ $(function(){
		49	+ setSortable();
		50	+ });
1	:plain	1	:plain
2	$('#issues-table-holder').html("#{escape_javascript(render('issues'))}");	2	$('#issues-table-holder').html("#{escape_javascript(render('issues'))}");
		3	+ setSortable();