##// END OF EJS Templates
jro_apps » redmine
RSS
Fix: error when posting to projects/add or users/add with no custom_fields parameter....
Jean-Philippe Lang -
r664:c8b3c8dfec4c
parent child
Show More
Show file before | Show file after | Hide comments
@@ -72,7 +72,7 class ProjectsController < ApplicationController
72 @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
72 @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
73 else
73 else
74 @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
74 @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
75 @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
75 @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
76 @project.custom_values = @custom_values
76 @project.custom_values = @custom_values
77 if params[:repository_enabled] && params[:repository_enabled] == "1"
77 if params[:repository_enabled] && params[:repository_enabled] == "1"
78 @project.repository = Repository.factory(params[:repository_scm])
78 @project.repository = Repository.factory(params[:repository_scm])
Show file before | Show file after | Hide comments
@@ -58,7 +58,7 class UsersController < ApplicationController
58 @user.admin = params[:user][:admin] || false
58 @user.admin = params[:user][:admin] || false
59 @user.login = params[:user][:login]
59 @user.login = params[:user][:login]
60 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
60 @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
61 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
61 @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
62 @user.custom_values = @custom_values
62 @user.custom_values = @custom_values
63 if @user.save
63 if @user.save
64 Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
64 Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
Show file before | Show file after | Hide comments
@@ -21,7 +21,7 class CustomValue < ActiveRecord::Base
21
21
22 protected
22 protected
23 def validate
23 def validate
24 errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?
24 errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?
25 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
25 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
26 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
26 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
27 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
27 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
Show file before | Show file after | Hide comments
@@ -45,7 +45,11 class AdminTest < ActionController::IntegrationTest
45 get "projects/add"
45 get "projects/add"
46 assert_response :success
46 assert_response :success
47 assert_template "projects/add"
47 assert_template "projects/add"
48 post "projects/add", :project => { :name => "blog", :description => "weblog", :identifier => "blog", :is_public => 1}
48 post "projects/add", :project => { :name => "blog",
49 :description => "weblog",
50 :identifier => "blog",
51 :is_public => 1 },
52 'custom_fields[3]' => 'Beta'
49 assert_redirected_to "admin/projects"
53 assert_redirected_to "admin/projects"
50 assert_equal 'Successful creation.', flash[:notice]
54 assert_equal 'Successful creation.', flash[:notice]
51
55
General Comments 0
You need to be logged in to leave comments. Login now