Potlatch 0.11b
This commit is contained in:
parent
c18d684dda
commit
8696d144ad
3 changed files with 451 additions and 122 deletions
|
@ -510,6 +510,7 @@ class AmfController < ApplicationController
|
||||||
# We're deleting the relation
|
# We're deleting the relation
|
||||||
relation.delete_with_history!(new_relation, user)
|
relation.delete_with_history!(new_relation, user)
|
||||||
end
|
end
|
||||||
|
updatetimeout(changeset_id)
|
||||||
end # transaction
|
end # transaction
|
||||||
|
|
||||||
if relid <= 0
|
if relid <= 0
|
||||||
|
@ -633,6 +634,7 @@ class AmfController < ApplicationController
|
||||||
# and we don't want to delete it
|
# and we don't want to delete it
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
updatetimeout(changeset_id)
|
||||||
|
|
||||||
end # transaction
|
end # transaction
|
||||||
|
|
||||||
|
@ -695,6 +697,8 @@ class AmfController < ApplicationController
|
||||||
# We're deleting the node
|
# We're deleting the node
|
||||||
node.delete_with_history!(new_node, user)
|
node.delete_with_history!(new_node, user)
|
||||||
end
|
end
|
||||||
|
updatetimeout(changeset_id)
|
||||||
|
|
||||||
end # transaction
|
end # transaction
|
||||||
|
|
||||||
if id <= 0
|
if id <= 0
|
||||||
|
@ -775,6 +779,7 @@ class AmfController < ApplicationController
|
||||||
# elsewhere and we don't want to delete it
|
# elsewhere and we don't want to delete it
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
updatetimeout(changeset_id)
|
||||||
|
|
||||||
end # transaction
|
end # transaction
|
||||||
[0, way_id]
|
[0, way_id]
|
||||||
|
@ -810,6 +815,15 @@ class AmfController < ApplicationController
|
||||||
return user
|
return user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Update changeset timeout
|
||||||
|
# i.e. one hour after current edit
|
||||||
|
|
||||||
|
def updatetimeout(changeset_id) #:doc:
|
||||||
|
cs = Changeset.find(changeset_id)
|
||||||
|
cs.closed_at = Time.now.getutc + Changeset::IDLE_TIMEOUT
|
||||||
|
cs.save!
|
||||||
|
end
|
||||||
|
|
||||||
# Send AMF response
|
# Send AMF response
|
||||||
|
|
||||||
def sendresponse(results)
|
def sendresponse(results)
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue