Merge branch 'szzh' into develop

app/assets/javascripts/web_footer_company.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/web_footer_company.css.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the WebFooterCompany controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/account_controller.rb

@@ -66,7 +66,7 @@ class AccountController < ApplicationController
         if @user.save
           @token.destroy
           flash[:notice] = l(:notice_account_password_updated)
-          redirect_to signin_path
+          redirect_to signin_url
           return
         end
       end
@@ -92,7 +92,7 @@ class AccountController < ApplicationController
             Mailer.lost_password(token).deliver
           end
             flash[:notice] = l(:notice_account_lost_email_sent)
-            redirect_to signin_path
+            redirect_to signin_url
           return                      
         end
       end
@@ -136,7 +136,7 @@ class AccountController < ApplicationController
           session[:auth_source_registration] = nil
           self.logged_user = @user
           flash[:notice] = l(:notice_account_activated)
-          redirect_to my_account_path
+          redirect_to my_account_url
         end
       else
         @user.login = params[:user][:login]
@@ -204,7 +204,7 @@ class AccountController < ApplicationController
       token.destroy
       flash[:notice] = l(:notice_account_activated)
     end
-    redirect_to signin_path
+    redirect_to signin_url
   end
 
   def valid_ajax
@@ -363,7 +363,7 @@ class AccountController < ApplicationController
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
       Mailer.register(token).deliver
       flash[:notice] = l(:notice_account_register_done)
-      redirect_to signin_path
+      redirect_to signin_url
     else
       yield if block_given?
     end
@@ -380,7 +380,7 @@ class AccountController < ApplicationController
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
       self.logged_user = user
       flash[:notice] = l(:notice_account_activated)
-      redirect_to my_account_path
+      redirect_to my_account_url
     else
       yield if block_given?
     end
@@ -402,6 +402,6 @@ class AccountController < ApplicationController
 
   def account_pending
     flash[:notice] = l(:notice_account_pending)
-    redirect_to signin_path
+    redirect_to signin_url
   end
 end

app/controllers/admin_controller.rb

@@ -86,7 +86,7 @@ class AdminController < ApplicationController
         flash[:error] = l(:error_can_t_load_default_data, e.message)
       end
     end
-    redirect_to admin_path
+    redirect_to admin_url
   end
 
   def test_email
@@ -100,7 +100,7 @@ class AdminController < ApplicationController
       flash[:error] = l(:notice_email_error, e.message)
     end
     ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
-    redirect_to settings_path(:tab => 'notifications')
+    redirect_to settings_url(:tab => 'notifications')
   end
 
   def info
@@ -159,7 +159,7 @@ class AdminController < ApplicationController
         respond_to do |format|
           flash[:notice] = l(:notice_successful_update)
           format.html {
-            redirect_to admin_first_page_made_path
+            redirect_to admin_first_page_made_url
           }
           format.api  { render_api_ok }
           #format.json { render json: @first_page, status: :created, location: @first_page }
@@ -194,7 +194,7 @@ class AdminController < ApplicationController
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_update)
-            redirect_to admin_course_page_made_path
+            redirect_to admin_course_page_made_url
           }
           format.api  { render_api_ok }
         end
@@ -217,11 +217,11 @@ class AdminController < ApplicationController
     if request.get?
       @contest_page = FirstPage.where("page_type = 'contest'").first
       @first_page = FirstPage.where("page_type = 'project'").first
-      @notification = ContestNotification.all.first;
+      @notification = ContestNotification.first;
     elsif request.post?
       @first_page = FirstPage.where("page_type = 'project'").first
       @contest_page = FirstPage.where("page_type = 'contest'").first
-      @notification = ContestNotification.all.first;
+      @notification = ContestNotification.first;
       @first_page.web_title = params[:web_title]
       @contest_page.web_title = params[:web_title]
       @contest_page.title = params[:contest_title]
@@ -235,7 +235,7 @@ class AdminController < ApplicationController
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_update)
-            redirect_to admin_contest_page_made_path
+            redirect_to admin_contest_page_made_url
           }
           format.api  { render_api_ok }
         end
@@ -254,13 +254,13 @@ class AdminController < ApplicationController
 
   def web_footer_made
     if request.get?
-      @organizer = WebFooterOranizer.all.first
+      @organizer = WebFooterOranizer.first
       @first_page = FirstPage.where("page_type = 'project'").first
       #@notification = ContestNotification.all.first;
     elsif request.post?
       @first_page = FirstPage.where("page_type = 'project'").first
       @first_page.web_title = params[:web_title]
-      @organizer = WebFooterOranizer.all.first
+      @organizer = WebFooterOranizer.first
       if @organizer.nil?
         @organizer = WebFooterOranizer.new
       end
@@ -270,7 +270,7 @@ class AdminController < ApplicationController
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_update)
-            redirect_to admin_web_footer_made_path
+            redirect_to admin_web_footer_made_url
           }
           format.api  { render_api_ok }
         end

app/controllers/application_controller.rb

@@ -209,8 +209,8 @@ class ApplicationController < ActionController::Base
         url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
       end
       respond_to do |format|
-        format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
-        format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
+        format.html { redirect_to signin_url }
+        format.atom { redirect_to signin_url }
         format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
         format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
         format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
@@ -763,7 +763,7 @@ class ApplicationController < ActionController::Base
   end
 
   def find_web_footer
-    @organize = WebFooterOranizer.all.first
-    @companys = WebFooterCompany.all
+    @organize = WebFooterOranizer.first
+    @companies = WebFooterCompany.all
   end
 end

app/controllers/auth_sources_controller.rb

@@ -36,7 +36,7 @@ class AuthSourcesController < ApplicationController
     @auth_source = AuthSource.new_subclass_instance(params[:type], params[:auth_source])
     if @auth_source.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to auth_sources_path
+      redirect_to auth_sources_url
     else
       render :action => 'new'
     end
@@ -48,7 +48,7 @@ class AuthSourcesController < ApplicationController
   def update
     if @auth_source.update_attributes(params[:auth_source])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to auth_sources_path
+      redirect_to auth_sources_url
     else
       render :action => 'edit'
     end
@@ -61,7 +61,7 @@ class AuthSourcesController < ApplicationController
     rescue Exception => e
       flash[:error] = l(:error_unable_to_connect, e.message)
     end
-    redirect_to auth_sources_path
+    redirect_to auth_sources_url
   end
 
   def destroy
@@ -69,7 +69,7 @@ class AuthSourcesController < ApplicationController
       @auth_source.destroy
       flash[:notice] = l(:notice_successful_delete)
     end
-    redirect_to auth_sources_path
+    redirect_to auth_sources_url
   end
 
   def autocomplete_for_new_user

app/controllers/bids_controller.rb

@@ -612,9 +612,9 @@ class BidsController < ApplicationController
     binding_project = params[:binding_project]
     if can_delete_project_homework(BidingProject.find(binding_project),User.current)
       if BidingProject.delete(binding_project)
-        redirect_to project_for_bid_path
+        redirect_to project_for_bid_url
       else
-        redirect_to 403;
+        render_403;
       end
     end
   end
@@ -731,7 +731,7 @@ class BidsController < ApplicationController
           flash[:notice] = l(:label_bid_succeed)
         end
       end
-      redirect_to respond_path(@bid)
+      redirect_to respond_url(@bid)
     else
       @bid.safe_attributes = params[:bid]
       render :action => 'new_bid'
@@ -755,7 +755,7 @@ class BidsController < ApplicationController
           flash[:notice] = l(:label_bid_succeed)
         end
       end
-      redirect_to respond_path(@bid)
+      redirect_to respond_url(@bid)
     else
       @bid.safe_attributes = params[:bid]
       render :action => 'new_bid'
@@ -782,7 +782,7 @@ class BidsController < ApplicationController
           flash[:notice] = l(:label_bid_succeed)
         end
       end
-      redirect_to respond_path(@bid)
+      redirect_to respond_url(@bid)
     else
       @bid.safe_attributes = params[:bid]
       render :action => 'new_bid'
@@ -811,7 +811,7 @@ class BidsController < ApplicationController
           flash[:notice] = l(:label_bid_succeed)
         end
       end
-      redirect_to respond_path(@bid)
+      redirect_to respond_url(@bid)
     else
       @bid.safe_attributes = params[:bid]
       @homework = @bid
@@ -859,7 +859,7 @@ class BidsController < ApplicationController
     @bid.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
     if @bid.save
       flash[:notice] = l(:label_update_homework_succeed)
-      redirect_to course_homework_path(@course)
+      redirect_to course_homework_url(@course)
     else
       @bid.safe_attributes = params[:bid]
       render :action => 'edit', :layout =>'base_courses'

app/controllers/boards_controller.rb

@@ -108,7 +108,7 @@ class BoardsController < ApplicationController
       flash[:notice] = l(:notice_successful_create)
       #Modified by young
       #redirect_to_settings_in_projects
-      redirect_to project_board_path(@project, @board)
+      redirect_to project_board_url(@project, @board)
       #Ended by young
     else
       render :action => 'new'
@@ -137,7 +137,7 @@ class BoardsController < ApplicationController
 
 private
   def redirect_to_settings_in_projects
-    redirect_to settings_project_path(@project, :tab => 'boards')
+    redirect_to settings_project_url(@project, :tab => 'boards')
   end
 
   def find_board_if_available

app/controllers/comments_controller.rb

@@ -32,12 +32,12 @@ class CommentsController < ApplicationController
       flash[:notice] = l(:label_comment_added)
     end
 
-    redirect_to news_path(@news)
+    redirect_to news_url(@news)
   end
 
   def destroy
     @news.comments.find(params[:comment_id]).destroy
-    redirect_to news_path(@news)
+    redirect_to news_url(@news)
   end
 
   private

app/controllers/contestnotifications_controller.rb

@@ -118,7 +118,7 @@ class ContestnotificationsController < ApplicationController
     if @contestnotification.save
       render_attachment_warning_if_needed(@contestnotification)
       flash[:notice] = l(:notice_successful_create)
-      redirect_to contest_contestnotifications_path(@contest)
+      redirect_to contest_contestnotifications_url(@contest)
     else
       layout_file = 'base_newcontest'
       render :action => 'new', :layout => layout_file
@@ -145,7 +145,7 @@ class ContestnotificationsController < ApplicationController
     if @contestnotification.save
       render_attachment_warning_if_needed(@contestnotification)
       flash[:notice] = l(:notice_successful_update)
-      redirect_to contest_contestnotification_path(@contestnotification.contest, @contestnotification)
+      redirect_to contest_contestnotification_url(@contestnotification.contest, @contestnotification)
     else
       render :action => 'edit'
     end
@@ -163,7 +163,7 @@ class ContestnotificationsController < ApplicationController
     # end
     @contestnotification = Contestnotification.find(params[:id])
     @contestnotification.destroy
-    redirect_to contest_contestnotifications_path(@contest)
+    redirect_to contest_contestnotifications_url(@contest)
   end
 
   private

app/controllers/contests_controller.rb

@@ -44,7 +44,7 @@ class ContestsController < ApplicationController
     #@contests = @contests.like(params[:name]) if params[:name].present?
     @contests =  Contest.visible.where("name like '%#{params[:name]}%'")
     if params[:contests_search]
-      (redirect_to contests_path, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+      (redirect_to contests_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
     end
     @contest_count = @contests.count
     @contest_pages = Paginator.new @contest_count, @limit, params['page']
@@ -617,7 +617,7 @@ class ContestsController < ApplicationController
           flash[:notice] = l(:label_contesting_created_succeed)
         end
       end
-      redirect_to show_contest_contest_path(@contest)
+      redirect_to show_contest_contest_url(@contest)
     else
       @contest.safe_attributes = params[:contest]
       render :action => 'new_contest'
@@ -641,7 +641,7 @@ class ContestsController < ApplicationController
           flash[:notice] = l(:label_contesting_updated_succeed)
         end
       end
-      redirect_to show_contest_contest_path(@contest)
+      redirect_to show_contest_contest_url(@contest)
       
     else
       @contest.safe_attributes = params[:contest]

app/controllers/courses_controller.rb

@@ -79,14 +79,13 @@ class CoursesController < ApplicationController
       respond_to do |format|
         format.html {
           flash[:notice] = l(:notice_successful_update)
-          redirect_to settings_course_path(@course)
+          redirect_to settings_course_url(@course)
         }
         format.api  { render_api_ok }
       end
     else
       respond_to do |format|
         format.html {
-          settings
           render :action => 'settings'
         }
         format.api  { render_validation_errors(@course) }
@@ -103,7 +102,7 @@ class CoursesController < ApplicationController
   def search
     courses_all = Course.all_course
     name = params[:name]
-    (redirect_to courses_path, :notice => l(:label_sumbit_empty);return) if name.blank?
+    (redirect_to courses_url, :notice => l(:label_sumbit_empty);return) if name.blank?
     @courses = courses_all.visible
     if params[:name].present?
       @courses_all = @courses.like(params[:name])
@@ -264,11 +263,11 @@ class CoursesController < ApplicationController
           format.html {
             flash[:notice] = l(:notice_successful_create)
             if params[:continue]
-              redirect_to new_course_path(attrs, :course => '0')
+              redirect_to new_course_url(attrs, :course => '0')
             elsif params[:course_continue]
-              redirect_to new_course_path(:course => '1')
+              redirect_to new_course_url(:course => '1')
             else
-              redirect_to settings_course_path(@course, :course_type => 1)
+              redirect_to settings_course_url(@course, :course_type => 1)
             end
           }
           format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }

app/controllers/custom_fields_controller.rb

@@ -34,7 +34,7 @@ class CustomFieldsController < ApplicationController
     if @custom_field.save
       flash[:notice] = l(:notice_successful_create)
       call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
-      redirect_to custom_fields_path(:tab => @custom_field.class.name)
+      redirect_to custom_fields_url(:tab => @custom_field.class.name)
     else
       render :action => 'new'
     end
@@ -47,7 +47,7 @@ class CustomFieldsController < ApplicationController
     if @custom_field.update_attributes(params[:custom_field])
       flash[:notice] = l(:notice_successful_update)
       call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
-      redirect_to custom_fields_path(:tab => @custom_field.class.name)
+      redirect_to custom_fields_url(:tab => @custom_field.class.name)
     else
       render :action => 'edit'
     end
@@ -59,7 +59,7 @@ class CustomFieldsController < ApplicationController
     rescue
       flash[:error] = l(:error_can_not_delete_custom_field)
     end
-    redirect_to custom_fields_path(:tab => @custom_field.class.name)
+    redirect_to custom_fields_url(:tab => @custom_field.class.name)
   end
 
   private

app/controllers/documents_controller.rb

@@ -76,7 +76,7 @@ class DocumentsController < ApplicationController
     if @document.save
       render_attachment_warning_if_needed(@document)
       flash[:notice] = l(:notice_successful_create)
-      redirect_to project_documents_path(@project)
+      redirect_to project_documents_url(@project)
     else
       render :action => 'new'
     end
@@ -89,7 +89,7 @@ class DocumentsController < ApplicationController
     @document.safe_attributes = params[:document]
     if request.put? and @document.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_to document_path(@document)
+      redirect_to document_url(@document)
     else
       render :action => 'edit'
     end
@@ -97,7 +97,7 @@ class DocumentsController < ApplicationController
 
   def destroy
     @document.destroy if request.delete?
-    redirect_to project_documents_path(@project)
+    redirect_to project_documents_url(@project)
   end
 
   def add_attachment
@@ -107,7 +107,7 @@ class DocumentsController < ApplicationController
     if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
       Mailer.attachments_added(attachments[:files]).deliver
     end
-    redirect_to document_path(@document)
+    redirect_to document_url(@document)
   end
 
   # 权限判断

app/controllers/enumerations_controller.rb

@@ -46,7 +46,7 @@ class EnumerationsController < ApplicationController
   def create
     if request.post? && @enumeration.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to enumerations_path
+      redirect_to enumerations_url
     else
       render :action => 'new'
     end
@@ -58,7 +58,7 @@ class EnumerationsController < ApplicationController
   def update
     if request.put? && @enumeration.update_attributes(params[:enumeration])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to enumerations_path
+      redirect_to enumerations_url
     else
       render :action => 'edit'
     end
@@ -68,12 +68,12 @@ class EnumerationsController < ApplicationController
     if !@enumeration.in_use?
       # No associated objects
       @enumeration.destroy
-      redirect_to enumerations_path
+      redirect_to enumerations_url
       return
     elsif params[:reassign_to_id]
       if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
         @enumeration.destroy(reassign_to)
-        redirect_to enumerations_path
+        redirect_to enumerations_url
         return
       end
     end

app/controllers/files_controller.rb

@@ -178,7 +178,7 @@ class FilesController < ApplicationController
        respond_to do |format|
          format.js
          format.html {
-           redirect_to project_files_path(@project)
+           redirect_to project_files_url(@project)
          }
        end
      elsif @course
@@ -206,7 +206,7 @@ class FilesController < ApplicationController
        respond_to do |format|
          format.js
          format.html {
-           redirect_to course_files_path(@course)
+           redirect_to course_files_url(@course)
          }
        end
      end

app/controllers/forums_controller.rb

@@ -23,7 +23,7 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @memo.save
-        format.html { redirect_to (forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
+        format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
       else
         sort_init 'updated_at', 'desc'
@@ -170,7 +170,7 @@ class ForumsController < ApplicationController
   def search_forum
     # @forums = paginateHelper Forum.where("name LIKE '%#{params[:name]}%'")
     q = "%#{params[:name].strip}%"
-    (redirect_to forums_path, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+    (redirect_to forums_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @forums_all = Forum.where("name LIKE ?", q)
     @forums_count = @forums_all.count

app/controllers/groups_controller.rb

@@ -52,7 +52,7 @@ class GroupsController < ApplicationController
       if @group.save
         format.html {
           flash[:notice] = l(:notice_successful_create)
-          redirect_to(params[:continue] ? new_group_path : groups_path)
+          redirect_to(params[:continue] ? new_group_url : groups_url)
         }
         format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
       else
@@ -71,7 +71,7 @@ class GroupsController < ApplicationController
     respond_to do |format|
       if @group.save
         flash[:notice] = l(:notice_successful_update)
-        format.html { redirect_to(groups_path) }
+        format.html { redirect_to(groups_url) }
         format.api  { render_api_ok }
       else
         format.html { render :action => "edit" }
@@ -84,7 +84,7 @@ class GroupsController < ApplicationController
     @group.destroy
 
     respond_to do |format|
-      format.html { redirect_to(groups_path) }
+      format.html { redirect_to(groups_url) }
       format.api  { render_api_ok }
     end
   end
@@ -93,7 +93,7 @@ class GroupsController < ApplicationController
     @users = User.find_all_by_id(params[:user_id] || params[:user_ids])
     @group.users << @users if request.post?
     respond_to do |format|
-      format.html { redirect_to edit_group_path(@group, :tab => 'users') }
+      format.html { redirect_to edit_group_url(@group, :tab => 'users') }
       format.js
       format.api { render_api_ok }
     end
@@ -102,7 +102,7 @@ class GroupsController < ApplicationController
   def remove_user
     @group.users.delete(User.find(params[:user_id])) if request.delete?
     respond_to do |format|
-      format.html { redirect_to edit_group_path(@group, :tab => 'users') }
+      format.html { redirect_to edit_group_url(@group, :tab => 'users') }
       format.js
       format.api { render_api_ok }
     end
@@ -118,7 +118,7 @@ class GroupsController < ApplicationController
     @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
     @membership.save if request.post?
     respond_to do |format|
-      format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
+      format.html { redirect_to edit_group_url(@group, :tab => 'memberships') }
       format.js
     end
   end
@@ -126,7 +126,7 @@ class GroupsController < ApplicationController
   def destroy_membership
     Member.find(params[:membership_id]).destroy if request.post?
     respond_to do |format|
-      format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
+      format.html { redirect_to edit_group_url(@group, :tab => 'memberships') }
       format.js
     end
   end

app/controllers/homework_attach_controller.rb

@@ -110,7 +110,7 @@ class HomeworkAttachController < ApplicationController
 
         if @homework.save
           respond_to do |format|
-            format.html { redirect_to course_for_bid_path @homework.bid }
+            format.html { redirect_to course_for_bid_url @homework.bid }
             format.json { head :no_content }
           end
         else
@@ -215,7 +215,7 @@ class HomeworkAttachController < ApplicationController
       end
       if @homework.save
         respond_to do |format|
-          format.html { redirect_to course_for_bid_path @homework.bid }
+          format.html { redirect_to course_for_bid_url @homework.bid }
           format.json { head :no_content }
         end
       else
@@ -230,7 +230,7 @@ class HomeworkAttachController < ApplicationController
     if User.current.admin? || User.current == @homework.user
       if @homework.destroy
         respond_to do |format|
-          format.html { redirect_to course_for_bid_path @homework.bid }
+          format.html { redirect_to course_for_bid_url @homework.bid }
           format.json { head :no_content }
         end
       else
@@ -315,7 +315,7 @@ class HomeworkAttachController < ApplicationController
     @homework = HomeworkAttach.find(params[:jour_id])
     @add_jour = @homework.addjours User.current.id, params[:new_form][:user_message],0,params[:is_comprehensive_evaluation]
     respond_to do |format|
-      format.html { redirect_to homework_attach_path @homework }
+      format.html { redirect_to homework_attach_url @homework }
       format.json { head :no_content }
     end
   end

app/controllers/issue_categories_controller.rb

@@ -114,7 +114,7 @@ class IssueCategoriesController < ApplicationController
   private
 
   def redirect_to_settings_in_projects
-    redirect_to settings_project_path(@project, :tab => 'categories')
+    redirect_to settings_project_url(@project, :tab => 'categories')
   end
 
   # Wrap ApplicationController's find_model_object method to set

app/controllers/issue_relations_controller.rb

@@ -48,7 +48,7 @@ class IssueRelationsController < ApplicationController
     saved = @relation.save
 
     respond_to do |format|
-      format.html { redirect_to issue_path(@issue) }
+      format.html { redirect_to issue_url(@issue) }
       format.js {
         @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
       }
@@ -67,7 +67,7 @@ class IssueRelationsController < ApplicationController
     @relation.destroy
 
     respond_to do |format|
-      format.html { redirect_to issue_path(@relation.issue_from) }
+      format.html { redirect_to issue_url(@relation.issue_from) }
       format.js
       format.api  { render_api_ok }
     end

app/controllers/issue_statuses_controller.rb

@@ -42,7 +42,7 @@ class IssueStatusesController < ApplicationController
     @issue_status = IssueStatus.new(params[:issue_status])
     if request.post? && @issue_status.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to issue_statuses_path
+      redirect_to issue_statuses_url
     else
       render :action => 'new'
     end
@@ -56,7 +56,7 @@ class IssueStatusesController < ApplicationController
     @issue_status = IssueStatus.find(params[:id])
     if request.put? && @issue_status.update_attributes(params[:issue_status])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to issue_statuses_path
+      redirect_to issue_statuses_url
     else
       render :action => 'edit'
     end
@@ -64,10 +64,10 @@ class IssueStatusesController < ApplicationController
 
   def destroy
     IssueStatus.find(params[:id]).destroy
-    redirect_to issue_statuses_path
+    redirect_to issue_statuses_url
   rescue
     flash[:error] = l(:error_unable_delete_issue_status)
-    redirect_to issue_statuses_path
+    redirect_to issue_statuses_url
   end
 
   def update_issue_done_ratio
@@ -76,6 +76,6 @@ class IssueStatusesController < ApplicationController
     else
       flash[:error] =  l(:error_issue_done_ratios_not_updated)
     end
-    redirect_to issue_statuses_path
+    redirect_to issue_statuses_url
   end
 end

app/controllers/issues_controller.rb

@@ -160,9 +160,9 @@ class IssuesController < ApplicationController
           #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
           if params[:continue]
             attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
-            redirect_to new_project_issue_path(@issue.project, :issue => attrs)
+            redirect_to new_project_issue_url(@issue.project, :issue => attrs)
           else
-            redirect_to issue_path(@issue)
+            redirect_to issue_url(@issue)
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
@@ -320,9 +320,9 @@ class IssuesController < ApplicationController
 
     if params[:follow]
       if @issues.size == 1 && moved_issues.size == 1
-        redirect_to issue_path(moved_issues.first)
+        redirect_to issue_url(moved_issues.first)
       elsif moved_issues.map(&:project).uniq.size == 1
-        redirect_to project_issues_path(moved_issues.map(&:project).first)
+        redirect_to project_issues_url(moved_issues.map(&:project).first)
       end
     else
       redirect_back_or_default _project_issues_path(@project)
@@ -409,7 +409,7 @@ class IssuesController < ApplicationController
       when 'add_notes'
         issue_attributes = issue_attributes.slice(:notes)
       when 'cancel'
-        redirect_to issue_path(@issue)
+        redirect_to issue_url(@issue)
         return false
       end
     end

app/controllers/journals_controller.rb

@@ -86,7 +86,7 @@ class JournalsController < ApplicationController
       @journal.destroy if @journal.details.empty? && @journal.notes.blank?
       call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
       respond_to do |format|
-        format.html { redirect_to issue_path(@journal.journalized) }
+        format.html { redirect_to issue_url(@journal.journalized) }
         format.js { render :action => 'update' }
       end
     else
@@ -103,7 +103,7 @@ class JournalsController < ApplicationController
   # Delete a journals added by young
   def destroy
     @journal.destroy
-    redirect_to issue_path(@journal.journalized)
+    redirect_to issue_url(@journal.journalized)
   end
 
   private

app/controllers/members_controller.rb

@@ -317,10 +317,10 @@ class MembersController < ApplicationController
   private
 
   def redirect_to_settings_in_projects
-    redirect_to settings_project_path(@project, :tab => 'members')
+    redirect_to settings_project_url(@project, :tab => 'members')
   end
 
   def redirect_to_settings_in_courses
-    redirect_to settings_course_path(@course, :tab => 'members')
+    redirect_to settings_course_url(@course, :tab => 'members')
   end
 end