Commit graph

351 commits

Author SHA1 Message Date
Tom Hughes
b527d27674 Use a polymorphic association to model relation members and add
associations for upward links from objects to relations that they
are a part of.
2008-06-21 17:38:17 +00:00
Tom Hughes
a21824f754 Removed bogus belongs_to user declaration. 2008-06-21 16:19:36 +00:00
Tom Hughes
7d9bf3634c Work around the fact that exists? no longer works for models with
no primary key.
2008-06-07 22:40:39 +00:00
Shaun McDonald
b8a7d956bf Fixing indentation 2008-06-02 15:22:17 +00:00
Shaun McDonald
0c2d503f1e Fixing indentation 2008-06-02 15:13:29 +00:00
Tom Hughes
88105d9c64 Merge 7744:7922 from trunk. 2008-05-28 16:37:31 +00:00
Shaun McDonald
de5e96585b Add a check to make sure that a node/way/relation doesn't already exist in the relation as part of the preconditions. closes #718 2008-05-20 15:25:18 +00:00
Gabriel Ebner
ea1961e3ce api06: s/delete_with_relations_and_history/delete_with_history/g 2008-05-12 21:10:38 +00:00
Gabriel Ebner
86b4d1bc2c api06: Move version-checking into the models, raising an exception on mismatch
(still not implemented for delete requests though.)
2008-05-12 21:05:11 +00:00
Christopher Schmidt
697449d6f1 node.tags is now (apparently) the same as tags_as_hash. 2008-05-12 01:22:04 +00:00
Christopher Schmidt
97cb1fd7fa undo composite keys change on old_ndoe 2008-05-11 23:02:06 +00:00
Christopher Schmidt
df11677afd from_xml sets a version on nodes 2008-05-11 22:27:40 +00:00
Christopher Schmidt
e9b86e914d add to_xml method for oldnode 2008-05-11 22:26:46 +00:00
Christopher Schmidt
604f9ddd46 spit out whether the changeset is open in the xml 2008-05-11 22:26:11 +00:00
Christopher Schmidt
9cbc370a7e add FIXME FIXME FIXME for serializing changes in a changeset 2008-05-11 20:07:47 +00:00
Christopher Schmidt
e48cbc6a5f Add support for accessing changesets as XML through the API via the
changeset controller "read" method
2008-05-11 20:03:17 +00:00
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00
Gabriel Ebner
013ef53c97 api06: Fix normal way and relation uploading (i.e. not as part of a diff).
(I'm sorry that I couldn't commit it earlier, but I didn't have access to an
internet connection until now.)
2008-05-05 22:41:32 +00:00
Gabriel Ebner
6ebb7045fe api06: Fix diff uploading (still doesn't give a useful response):
Modification and deletion works fine now.  Rollback also works apparently.
Just auto increment doesn't get reset.
2008-05-04 15:16:58 +00:00
Gabriel Ebner
3d6e1c67fb api06: Preliminary support for diff uploading. This will not return anything
useful and the code will need some heavy refactoring.
2008-05-04 13:52:43 +00:00
Tom Hughes
cf304fe60f Merge 7649:7673 from trunk. 2008-05-04 11:26:36 +00:00
Tom Hughes
02efd7ba4a Go back to using user_id+k as the primary key for user preferences but
actually using the composite primary key extension this time so that it
really works.

Also stop update_one tring to render a non-existent view, and add a
delete_one method to allow preferences to be deleted.
2008-05-04 11:18:38 +00:00
Gabriel Ebner
5ed2cbce02 api06: Merge changesets code from Frederik. 2008-05-04 10:45:47 +00:00
Frederik Ramm
8c5638d696 initial changeset support 2008-05-04 10:41:42 +00:00
Gabriel Ebner
bcbf417796 api06: Return version ids in XML responses. 2008-05-04 10:01:23 +00:00
Gabriel Ebner
6c31dbaaec split_node_tags: Remove old unused files. 2008-05-04 09:04:40 +00:00
Gabriel Ebner
de90f11f53 split_node_tags: Remove the left-over pre-merge files. 2008-05-03 16:28:50 +00:00
Gabriel Ebner
6ae23bed90 split_node_tags:
- Use InnoDB.
  - Put version column on the current_* tables.
  - Use transactions (untested).
2008-05-03 16:27:49 +00:00
Nick Black
1a6230fb25 merged node and old node models for normalised node tags 2008-05-03 16:06:43 +00:00
Nick Black
2660ce1868 node models for normalised node tags - pre merge 2008-05-03 16:01:55 +00:00
Nick Black
b214158d99 adds a temporary old_node object for use during migration 2008-05-03 14:32:36 +00:00
Gabriel Ebner
7eb181999d split_node_tags: Merge changes from main branch. 2008-05-03 14:11:23 +00:00
Nick Black
cf21eae743 adding node tag models 2008-05-03 14:07:07 +00:00
Tom Hughes
112ee9266c Make sure the recorded first point for a trace really is the first
point and not the last. Closes #709.
2008-04-27 12:27:46 +00:00
Tom Hughes
7d0a281d5b Include tags in GPX success and failure mails. Closes #480. 2008-04-27 12:18:19 +00:00
Christopher Schmidt
15d5997067 Add tags_as_hash to old_nodes 2008-04-20 15:12:56 +00:00
Steve Coast
ec264a935e nicer fix I think for nil / [] issue 2008-03-21 20:30:16 +00:00
Steve Coast
1f857565a6 more madness 2008-03-21 20:21:49 +00:00
Richard Fairhurst
740511066f fix problem with blank areas throwing a 500 2008-03-21 20:17:56 +00:00
Richard Fairhurst
112950ca3a various relations fixes 2008-03-21 19:00:39 +00:00
Richard Fairhurst
ae142c554b Potlatch 0.8 - be afraid, be very, very afraid 2008-03-19 01:03:51 +00:00
Tom Hughes
c0d2ad40c3 Work round ruby's half assed Tempfile class which, because for some
reason it is implemented by delegating to File (by inheriting from
DelegateClass(File)) rather than by inheriting from it, does not
actually look like a File, and hence does not look like an IO (in
that it does not respond to kind_of? IO calls).

In ruby 1.8.5 this doesn't matter as REXML checks that the source
it has been given responds to the methods it wants (using respond_to?
which is handled properly by DelegateClass) but in 1.8.4 which we
are running on rails2 REXML uses kind_of? to see if the source is
one it can use.
2008-03-06 12:43:10 +00:00
Steve Coast
d1f2b4ece9 remove deleteway logic from amf_controller (yay!) TomH: check with RichardF this is sane before deploying. worksforme. 2008-02-23 16:05:45 +00:00
Steve Coast
cacf1879c3 user images 2008-02-23 15:18:59 +00:00
Steve Coast
2e44f9ccf3 User prference system basically done 2008-02-23 13:37:36 +00:00
Steve Coast
e13337354d preference stuff 2008-02-23 11:12:42 +00:00
Tom Hughes
5fbc8ad3f4 Send email notifications when people comment on diary entries. Closes #655. 2008-02-04 00:15:28 +00:00
Tom Hughes
962573431e Move in_world? to GeoRecord model and correct comment. 2008-02-03 15:38:44 +00:00
Tom Hughes
d04c6d6ccd Optimise the Potlatch whichways and getway calls a bit. 2008-02-03 12:56:25 +00:00
Richard Fairhurst
da76d64e93 Potlatch 0.7 2008-02-01 17:19:11 +00:00