Commit graph

187 commits

Author SHA1 Message Date
Tom Hughes
db66d47e42 Merge potlatch_010 branch to head. 2008-07-18 11:02:10 +00:00
Tom Hughes
d6e047d7d4 Optimise finding of relations, partially reversing change #8443 but in
a more rails like way.
2008-07-16 23:42:59 +00:00
Tom Hughes
34d9360bee Minor tidyups. 2008-07-15 18:23:00 +00:00
Tom Hughes
6fa8647855 Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
and rework it to be a bit tidier.
2008-07-15 18:18:37 +00:00
Tom Hughes
50c0333ea6 Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010
branch for now until it has been reviewed.
2008-07-09 23:31:00 +00:00
Richard Fairhurst
62a1ec4748 Potlatch 0.10 2008-07-09 22:19:48 +00:00
Tom Hughes
97aefa23d0 Merge data browser branch to trunk. 2008-06-27 23:09:05 +00:00
Tom Hughes
def60c1935 Railsify relation selection (aka ripping out the f***in SQL). 2008-06-24 23:42:39 +00:00
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +00:00
Tom Hughes
d69a518b9e Merge 8377:8381 from trunk. 2008-06-22 14:46:46 +00:00
Tom Hughes
b72fedb162 Make the polymorphic relation association work properly. 2008-06-22 14:44:34 +00:00
Tom Hughes
960d13488a Merge 7922:8377 from trunk. 2008-06-22 12:23:43 +00:00
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
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
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +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
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
Tom Hughes
b8f87e0466 Fix typo. 2008-01-28 08:44:03 +00:00
Steve Coast
a855d20ba4 Most of a method to delete a way and all its nodes - but I'm waiting on splitting node tags out to their own table before finishing it. 2008-01-25 15:24:04 +00:00
Steve Coast
bbd769304c dont eager load tags (false primary key fucks all sorts of things up) and move delete way logic to model so that amf_controller can use it (plan is to do this with all of the methods. sigh.) 2008-01-25 14:32:45 +00:00
Xin Zheng
e7087af6bc minor changes 2008-01-25 13:57:42 +00:00
Steve Coast
9328e84ba1 Some node documentation 2008-01-24 13:04:04 +00:00
Steve Coast
3bd92c1670 move potlatch presets to only be generated once, and allow pulling in way_tags in a way via a false primary key 2008-01-24 10:52:10 +00:00
Tom Hughes
07e8449625 Allow a GPX to be fetched in XML format by fetching data.xml instead
of data (the data method returns it in the format it is stored in).

Closes #534.
2008-01-23 13:40:47 +00:00
Tom Hughes
bee38e63a3 Make things work with multipart keys. 2008-01-23 09:53:35 +00:00
Steve Coast
1c6ac719e6 replace whichways with rails-friendly code 2008-01-22 16:44:17 +00:00
Steve Coast
ddd5b4cf19 make amf_controller use rails objects, and stuff, in the getway method. You need to install the multipart keys plugin now, see the README. 2008-01-22 15:00:54 +00:00
Tom Hughes
8181cb4bf7 Add support for commenting on, and replying to, diary entries. 2008-01-17 23:12:25 +00:00
Tom Hughes
b416597507 Make the message reply link prefill the title with "Re: original title".
Closes #634.
2008-01-15 19:05:17 +00:00
Tom Hughes
425b3654d7 Mark mails as auto submitted. Closes #627. 2008-01-06 13:21:50 +00:00
Richard Fairhurst
914cad0aa2 show nearest 10 users (request by Blackadder) 2007-11-28 22:07:24 +00:00