This is an automated email from the git hooks/post-receive script. New commit to branch feature/3642 in repository jredmine. See http://git.nuiton.org/jredmine.git commit 730c5938b58f6e176af0e6174ffa4a6eb68ee68d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 4 08:17:50 2015 +0100 use new ActiveRecord Query API --- .../app/controllers/jredmine_controller.rb | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb index 2592251..37bd411 100644 --- a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb +++ b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb @@ -93,7 +93,7 @@ class JredmineController < ActionController::Base # recuperation des projets def get_projects - @projects = Project.find(:all) + @projects = Project.all().to_a render_array_result @projects, "projects" end @@ -119,13 +119,13 @@ class JredmineController < ActionController::Base # recuperation des differentes categories d'issues def get_issue_categories - @issue_categories = @project.issue_categories.find(:all) + @issue_categories = @project.issue_categories.all().to_a render_array_result @issue_categories, "issue-categories" end # recuperation des differentes statuts d'issues def get_issue_statuses - @issue_status = IssueStatus.find(:all) + @issue_status = IssueStatus.all().to_a render_array_result @issue_status, "issue-statuses" end # recuperation du projet @@ -135,7 +135,7 @@ class JredmineController < ActionController::Base # recuperation de tous les membres d'un projet def get_project_users - @members = @project.members.find(:all) + @members = @project.members.all().to_a @r = [] for m in @members u = User.find(m[:user_id]) @@ -149,38 +149,38 @@ class JredmineController < ActionController::Base # recuperation de toutes les annonces d'un projet def get_project_news - @news = @project.news.find(:all) + @news = @project.news.all().to_a render_array_result @news, "news" end # recuperation des trakers d'un projet def get_project_trackers - @trackers = @project.trackers.find(:all) + @trackers = @project.trackers.all().to_a render_array_result @trackers, "trackers" end # recuperation des versions d'un projet def get_project_versions - @versions = @project.versions.find(:all) + @versions = @project.versions.all().to_a render_array_result @versions, "versions" end # recuperation des versions fermees d'un projet def get_project_closed_versions - @versions = @project.versions.find(:all, :conditions => [ "status = 'closed'" ]) + @versions = @project.versions.where( status: 'closed').to_a render_array_result @versions, "versions" end # recuperation de toutes les issues d'un projet def get_project_issues - r =@project.issues.find(:all) + r =@project.issues.all().to_a render_array_result r, "issues" end # recuperation de toutes les issues ouvertes d'un projet def get_project_opened_issues r = [] - for i in @project.issues.find(:all) + for i in @project.issues.all().to_a if !i.closed? && i.status_id != 3 r << i end @@ -191,7 +191,7 @@ class JredmineController < ActionController::Base # recuperation de toutes les issues fermees d'un projet def get_project_closed_issues r = [] - for i in @project.issues.find(:all) + for i in @project.issues.all().to_a if i.closed? || i.status_id == 3 r << i end @@ -211,13 +211,13 @@ class JredmineController < ActionController::Base # recuperation des issues d'un projet pour une version donnee def get_version_issues - @issues = @version.fixed_issues.find(:all) + @issues = @version.fixed_issues.all().to_a render_array_result @issues, "issues" end # recuperation des issues ouvertes d'un projet pour une version donnee def get_version_opened_issues - issues = @version.fixed_issues.find(:all) + issues = @version.fixed_issues.all().to_a result = [] issues.each do |issue| if !issue.closed? && issue.status_id != 3 @@ -229,7 +229,7 @@ class JredmineController < ActionController::Base # recuperation des pieces jointes d'un projet pour une version donnee def get_version_attachments - @files = @version.attachments.find(:all) + @files = @version.attachments.all().to_a render_array_result @files, "attachments" end @@ -327,7 +327,7 @@ class JredmineController < ActionController::Base render_status 505, "Could not find old version #{old_version_name} for project #{@project.name}" return false end - old_issues = old_version.fixed_issues.find(:all) + old_issues = old_version.fixed_issues.all().to_a old_issues.each do |issue| sid = issue.status_id if !issue.closed? || ( sid == 1 || sid == 2 ) @@ -437,7 +437,7 @@ class JredmineController < ActionController::Base # recuperation des valeurs d'une enumeration def get_enumeration(type = params[:type]) #@result = Enumeration.get_values(type) - @result = Enumeration.find(:all, :conditions =>["type = :sqlParamType", {:sqlParamType => type}]) + @result = Enumeration.find("type = ?", type) render_array_result @result, "enumerations" end -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.