Disable issues sort. Recent issues on top. Fixed tests
This commit is contained in:
parent
e00390b377
commit
a2eda66b30
12 changed files with 29 additions and 47 deletions
|
@ -51,7 +51,6 @@ function initIssuesSearch() {
|
|||
if (terms.length >= 2 || terms.length == 0) {
|
||||
$.get(href, { 'f': status, 'terms': terms, 'milestone_id': milestone_id }, function(response) {
|
||||
$('#issues-table').html(response);
|
||||
setSortable();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -68,7 +67,6 @@ function initIssuesSearch() {
|
|||
*/
|
||||
function issuesPage(){
|
||||
initIssuesSearch();
|
||||
setSortable();
|
||||
$("#label_name").chosen();
|
||||
$("#assignee_id").chosen();
|
||||
$("#milestone_id").chosen();
|
||||
|
|
|
@ -201,6 +201,7 @@ a:focus {
|
|||
.cred { color:#D12F19; }
|
||||
.cgreen { color:#44aa22; }
|
||||
.cblack { color:#111; }
|
||||
.cdark { color:#444 }
|
||||
.cwhite { color:#fff !important }
|
||||
|
||||
/** COMMON STYLES **/
|
||||
|
|
|
@ -2,8 +2,9 @@ class Notify < ActionMailer::Base
|
|||
include Resque::Mailer
|
||||
add_template_helper ApplicationHelper
|
||||
|
||||
default_url_options[:host] = Gitlab.config.web_host
|
||||
default_url_options[:host] = Gitlab.config.web_host
|
||||
default_url_options[:protocol] = Gitlab.config.web_protocol
|
||||
default_url_options[:port] = Gitlab.config.web_port
|
||||
|
||||
default from: Gitlab.config.email_from
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ class Project < ActiveRecord::Base
|
|||
has_many :users, :through => :users_projects
|
||||
has_many :events, :dependent => :destroy
|
||||
has_many :merge_requests, :dependent => :destroy
|
||||
has_many :issues, :dependent => :destroy, :order => "closed, position"
|
||||
has_many :issues, :dependent => :destroy, :order => "closed, created_at DESC"
|
||||
has_many :milestones, :dependent => :destroy
|
||||
has_many :users_projects, :dependent => :destroy
|
||||
has_many :notes, :dependent => :destroy
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
%p.row_title= truncate(issue.title, :length => 100)
|
||||
|
||||
%span.update-author
|
||||
%small.cdark= "##{issue.id}"
|
||||
- if issue.assignee
|
||||
assigned to #{issue.assignee_name}
|
||||
- else
|
||||
|
|
|
@ -46,24 +46,3 @@
|
|||
$(function(){
|
||||
issuesPage();
|
||||
})
|
||||
|
||||
function setSortable(){
|
||||
$('#issues-table').sortable({
|
||||
axis: 'y',
|
||||
dropOnEmpty: false,
|
||||
handle: '.avatar',
|
||||
items: 'li',
|
||||
opacity: 0.4,
|
||||
scroll: true,
|
||||
update: function(){
|
||||
$.ajax({
|
||||
type: 'post',
|
||||
data: $('#issues-table').sortable('serialize'),
|
||||
dataType: 'script',
|
||||
complete: function(request){
|
||||
$('#issues-table').effect('highlight');
|
||||
},
|
||||
url: "#{sort_project_issues_path(@project)}"})
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
:plain
|
||||
$('#issues-table').html("#{escape_javascript(render('issues'))}");
|
||||
setSortable();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue