Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality

rep_quality
huang 9 years ago
commit 98f47d8b81

@ -110,7 +110,7 @@ module ApplicationHelper
sheet1[count_row,0] = issue.id sheet1[count_row,0] = issue.id
sheet1[count_row,1] = issue_tracker_change(issue.tracker_id) sheet1[count_row,1] = issue_tracker_change(issue.tracker_id)
sheet1[count_row,2] = issue.subject sheet1[count_row,2] = issue.subject
sheet1[count_row,3] = issue.description sheet1[count_row,3] = (issue.description.gsub(/<\/?.*?>/,"")).html_safe
sheet1[count_row,4] = issue_status_change(issue.status_id) sheet1[count_row,4] = issue_status_change(issue.status_id)
sheet1[count_row,5] = issue.assigned_to.try(:show_name) sheet1[count_row,5] = issue.assigned_to.try(:show_name)
sheet1[count_row,6] = issue_priority_change(issue.priority_id) sheet1[count_row,6] = issue_priority_change(issue.priority_id)

@ -60,9 +60,10 @@
function switch_assign_to(assign) { function switch_assign_to(assign) {
var assign = "option[value =" + assign + "]"; var assign = "option[value =" + assign + "]";
$("#issues_type_2").click(function(){ $("#issues_type_2").click(function(){
$("select[id='author_id']").val('');
}); });
$("select[id='assigned_to_id']").find(assign).attr("selected", "selected"); $("select[id='assigned_to_id']").find(assign).attr("selected", "selected");
$("select[id='author_id']").val('');
remote_function(); remote_function();
} }

Loading…
Cancel
Save