diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-22 13:29:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-22 13:29:26 +0000 |
| commit | 6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46 (patch) | |
| tree | af09ea2d29ce61690b656be91fbf82a3009ea1ed /app/controllers | |
| parent | 387836f8aa736eba4dfe0da879ad71bbc19dd224 (diff) | |
| download | redmine-6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46.tar.gz redmine-6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46.zip | |
JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/auto_completes_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/my_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/repositories_controller.rb | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index cedbf716c..203dae4e7 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -20,7 +20,7 @@ class AutoCompletesController < ApplicationController def issues @issues = [] - q = params[:q].to_s + q = (params[:q] || params[:term]).to_s query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues if q.match(/^\d+$/) @issues << query.visible.find_by_id(q.to_i) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index d92494540..b2c2a9dc7 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -179,7 +179,8 @@ class MyController < ApplicationController group = params[:group] @user = User.current if group.is_a?(String) - group_items = (params["list-#{group}"] || []).collect(&:underscore) + group_items = (params["blocks"] || []).collect(&:underscore) + group_items.each {|s| s.sub!(/^block_/, '')} if group_items and group_items.is_a? Array layout = @user.pref[:my_page_layout] || {} # remove group blocks if they are presents in other groups diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e6a76fbc3..b59946082 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -42,7 +42,6 @@ class RepositoriesController < ApplicationController @repository = Repository.factory(scm) @repository.is_default = @project.repository.nil? @repository.project = @project - render :layout => !request.xhr? end def create |