Skip to content

Commit

Permalink
bug fixing on issue dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
suganya-thulasiraman committed Apr 17, 2015
1 parent ea16ba7 commit c17554c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ If an apache passenger module is used then make sure the following settings are
Release Notes for 1.8
Features:
- Made compatible with Redmine 3.0.1.
- Implemented 'Save and Continue' button on time/expense sheet edit page.
Bugs:
- "wktime/getstatus" loading over HTTP on site served over HTTPS.
- Users can delete submitted & approved timesheets.
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/wktime_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def getissues
if subjectPart.present?
if subjectPart.match(/^\d+$/)
cond = ["((LOWER(#{Issue.table_name}.subject) LIKE ? OR #{Issue.table_name}.id=?) #{issueAssignToUsrCond} #{trackerIDCond}) #{projCond}", "%#{subjectPart.downcase}%","#{subjectPart.to_i}"]
else
else
cond = ["(LOWER(#{Issue.table_name}.subject) LIKE ? #{issueAssignToUsrCond} #{trackerIDCond}) #{projCond}", "%#{subjectPart.downcase}%"]
end
#issues = Issue.find_all_by_project_id(params[:project_id] || params[:project_ids] || projectids, :conditions => cond , :order => 'project_id')
Expand Down Expand Up @@ -1155,8 +1155,8 @@ def set_visible_issues(entry)
if @projectIssues[project_id].blank?
allIssues = Array.new
trackerids=nil
if(!params[:tracker_ids].blank?)
trackerids =" AND #{Issue.table_name}.tracker_id in(#{params[:tracker_ids]})"
if(!params[:tracker_ids].blank? && params[:tracker_ids] != "0")
trackerids = " AND #{Issue.table_name}.tracker_id in(#{params[:tracker_ids]})"
end
if Setting.plugin_redmine_wktime['wktime_closed_issue_ind'].to_i == 1
if !Setting.plugin_redmine_wktime[getTFSettingName()].blank? && Setting.plugin_redmine_wktime[getTFSettingName()] != ["0"] && params[:tracker_ids].blank?
Expand Down

0 comments on commit c17554c

Please sign in to comment.