deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactored IssuesController

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-06-12 11:31:38 +03:00
parent 3a2d7a6604
commit 0e33bf6eb0
3 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/assets/javascripts/issues.js
View file

@ -35,3 +35,29 @@ function backToIssues(){
}); });
}); });
} }
function initIssuesSearch() {
var href = $('.issue_search').parent().attr('action');
var last_terms = '';
$('.issue_search').keyup(function() {
var terms = $(this).val();
var milestone_id = $('#milestone_id').val();
var status = $('#status').val();
if (terms != last_terms) {
last_terms = terms;
if (terms.length >= 2 || terms.length == 0) {
$.get(href, { 'f': status, 'terms': terms, 'milestone_id': milestone_id }, function(response) {
$('#issues-table').html(response);
setSortable();
});
}
}
});
$('.delete-issue').live('ajax:success', function() {
$(this).closest('tr').fadeOut(); updatePage();
});
}

32
app/controllers/issues_controller.rb
View file

@ -23,16 +23,9 @@ class IssuesController < ApplicationController
respond_to :js, :html respond_to :js, :html
def index def index
@issues = case params[:f].to_i @issues = issues_filtered
when 1 then @project.issues
when 2 then @project.issues.closed
when 3 then @project.issues.opened.assigned(current_user)
else @project.issues.opened
end
@issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present?
@issues = @issues.page(params[:page]).per(20) @issues = @issues.page(params[:page]).per(20)
@issues = @issues.includes(:author, :project).order("critical, updated_at")
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
@ -111,15 +104,9 @@ class IssuesController < ApplicationController
def search def search
terms = params['terms'] terms = params['terms']
@project = Project.find(params['project']) @issues = issues_filtered
@issues = case params[:status].to_i
when 1 then @project.issues
when 2 then @project.issues.closed
when 3 then @project.issues.opened.assigned(current_user)
else @project.issues.opened
end.page(params[:page]).per(100)
@issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank? @issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank?
@issues = @issues.page(params[:page]).per(100)
render :partial => 'issues' render :partial => 'issues'
end end
@ -141,4 +128,17 @@ class IssuesController < ApplicationController
def module_enabled def module_enabled
return render_404 unless @project.issues_enabled return render_404 unless @project.issues_enabled
end end
def issues_filtered
@issues = case params[:f].to_i
when 1 then @project.issues
when 2 then @project.issues.closed
when 3 then @project.issues.opened.assigned(current_user)
else @project.issues.opened
end
@issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present?
@issues = @issues.includes(:author, :project).order("critical, updated_at")
@issues
end
end end

37
app/views/issues/index.html.haml
View file

@ -41,27 +41,14 @@
= render "issues" = render "issues"
:javascript :javascript
var href = $('.issue_search').parent().attr('action'); $(function(){
var last_terms = ''; initIssuesSearch();
setSortable();
$('.issue_search').keyup(function() { $("#milestone_id").chosen();
var terms = $(this).val(); $("#milestone_id").live("change", function(){
var project_id = $('#project_id').val(); $(this).closest("form").submit();
var status = $('#status').val(); });
if (terms != last_terms) { })
last_terms = terms;
if (terms.length >= 2 || terms.length == 0) {
$.get(href, { 'status': status, 'terms': terms, project: project_id }, function(response) {
$('#issues-table').html(response);
setSortable();
});
}
}
});
$('.delete-issue').live('ajax:success', function() {
$(this).closest('tr').fadeOut(); updatePage();});
function setSortable(){ function setSortable(){
$('#issues-table').sortable({ $('#issues-table').sortable({
@ -83,11 +70,3 @@
} }
}); });
} }
$(function(){
setSortable();
$("#milestone_id").chosen();
$("#milestone_id").live("change", function(){
$(this).closest("form").submit();
});
});