Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-23 07:34:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1223 for the single tag and single dependency case in the REST API

Browse source
This commit is contained in:
Reinier Balt 2011-11-20 14:48:49 +01:00
parent eb2f071c80
commit 960326efb4
3 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/todos_controller.rb
View file

@ -1518,10 +1518,12 @@ class TodosController < ApplicationController
@attributes = params['request'] && params['request']['todo'] || params['todo']
if @attributes && @attributes[:tags]
# for single tags, @attributed[:tags] returns a hash. For multiple tags,
# it with return an array of hashes. Make sure it is always an array of hashes
@attributes[:tags][:tag] = [@attributes[:tags][:tag]] unless @attributes[:tags][:tag].class == Array
# the REST api may use <tags> which will collide with tags association, so rename tags to add_tags
add_tags = @attributes[:tags]
@attributes[:add_tags] = @attributes[:tags]
@attributes.delete :tags
@attributes[:add_tags] = add_tags
end
end

23
app/models/todo.rb
View file

@ -299,24 +299,13 @@ class Todo < ActiveRecord::Base
# XML API fixups
def predecessor_dependencies=(params)
value = params[:predecessor]
return if value.nil?
if !value.nil?
if value.class == Array
value.each do |ele|
if ele.is_a? String
add_predecessor(self.user.todos.find_by_id(ele.to_i)) unless ele.blank?
else
predecessor_dependencies.build(value)
end
end
else
if ele.is_a? String
add_predecessor(self.user.todos.find_by_id(ele.to_i)) unless ele.blank?
else
predecessor_dependencies.build(value)
end
end
end
# for multiple dependencies, value will be an array of id's, but for a single dependency,
# value will be a string. In that case convert to array
value = [value] unless value.class == Array
value.each { |ele| add_predecessor(self.user.todos.find_by_id(ele.to_i)) unless ele.blank? }
end
alias_method :original_context=, :context=