Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-26 10:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix syntax errors for upgrade of Rails version

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2022-01-04 01:18:13 +02:00
parent 7f567862d7
commit 86e36b07a6
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/contexts_controller.rb
View file

@ -83,7 +83,7 @@ class ContextsController < ApplicationController
end
format.xml do
if @context.new_record?
render_failure @context.errors.to_xml.html_safe, 409
render_failure @context.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
else
head :created, :location => context_url(@context)
end

2
app/controllers/projects_controller.rb
View file

@ -186,7 +186,7 @@ class ProjectsController < ApplicationController
end
format.xml do
if @project.new_record?
render_failure @project.errors.to_xml.html_safe, 409
render_failure @project.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
else
head :created, :location => project_url(@project), :text => @project.id
end

6
app/controllers/todos_controller.rb
View file

@ -154,7 +154,7 @@ class TodosController < ApplicationController
if @saved
head :created, :location => todo_url(@todo)
else
render_failure @todo.errors.to_xml.html_safe, 409
render_failure @todo.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
end
end
end
@ -438,7 +438,7 @@ class TodosController < ApplicationController
rescue ActiveRecord::RecordInvalid => exception
record = exception.record
if record.is_a?(Dependency)
record.errors.each { |key, value| @todo.errors[key] << value }
record.errors.each { |key, value| @todo.errors.add(key, value) }
end
@saved = false
end
@ -1192,7 +1192,7 @@ end
begin
parse_date_per_user_prefs(date)
rescue
@todo.errors[:base] << error_msg
@todo.errors.add(:base, error_msg)
end
end

2
app/controllers/users_controller.rb
View file

@ -125,7 +125,7 @@ class UsersController < ApplicationController
unless user.new_record?
render :body => t('users.user_created'), :status => 200
else
render_failure user.errors.to_xml, 409
render_failure user.errors.full_messages.to_xml(root: "errors", skip_types: true), 409
end
return
end