Commit graph

1722 commits

Author SHA1 Message Date
Thomas Wood
14fdccc0d1 Commit bits of missing css that were required in previous upload. 2009-05-07 22:52:02 +00:00
Thomas Wood
d6b36b5752 De-duplicate some of the changeset stuff out to a new partial view.
Add css hooks for upcoming fix for #1734
2009-05-07 22:48:14 +00:00
Shaun McDonald
98a76339b8 Some more tests 2009-05-07 17:57:59 +00:00
Tom Hughes
3404fd5bbe Add foreign key constraints for users. 2009-05-07 17:54:52 +00:00
Shaun McDonald
6327e3e690 fix typo which meant that it was testing the node twice, rather than the node then the node history 2009-05-07 14:10:17 +00:00
Thomas Wood
c273b4b1fa Tests for PreconditionFailed error messages.
Change to relation.rb to bring element selection in-line with that of way, so to return nil to be caught later, rather than raise an error.
Change to way.rb to clarify which way on diff upload.
2009-05-06 21:08:50 +00:00
Thomas Wood
d7fd3fb6e5 One final (I've checked the rest now!) mis-referenced id, plus make the error msg simpler. 2009-05-06 19:55:25 +00:00
Shaun McDonald
e509850554 fixing the tests I broke earlier due to the fixture changes 2009-05-06 17:56:10 +00:00
Shaun McDonald
d10931effa More trace tests 2009-05-06 14:58:48 +00:00
Matt Amos
30bbca0f3b Potential fix for slow relation precondition checking based on Frederik's suggestion on the list to only check new members. 2009-05-06 10:35:39 +00:00
Shaun McDonald
589e5835c8 some tests for the site and export controllers 2009-05-05 18:31:37 +00:00
Shaun McDonald
d0e16cdb6c be a bit more specific when a way is a member of a relation. Actually return an error message when a relation precondition fails. Remove a debug statement. 2009-05-05 17:07:06 +00:00
Richard Fairhurst
8696d144ad Potlatch 0.11b 2009-05-04 23:37:06 +00:00
Thomas Wood
c18d684dda Sort the tags for the databrowser output. 2009-05-04 22:42:07 +00:00
Thomas Wood
1d48f48827 Fix another mis-referenced error message id! 2009-05-02 18:28:39 +00:00
Thomas Wood
22292debda Data browser changes, make links more user friendly, displaying name tag where possible.
Changes to models ok'd (and suggested as temporary solution) by TomH
References #1777
2009-05-02 00:26:37 +00:00
Tom Hughes
5b0e72ec71 Get rid of foreign_class specification which is no longer needed. 2009-05-01 23:20:53 +00:00
Thomas Wood
026d7775d2 Fix indentation fail 2009-05-01 21:01:02 +00:00
Thomas Wood
38d8f178f6 Fix AMF controller failing tests due to changed error messages. 2009-05-01 20:49:51 +00:00
Shaun McDonald
d5a6efca7f a fix for the relation controller test 2009-05-01 10:29:19 +00:00
Tom Hughes
329b6faf91 Use association names with :joins instead of writing the SQL for the
join by hand.
2009-04-30 23:45:55 +00:00
Matt Amos
264b92bd9f Fixed bad coding practice in test. 2009-04-30 18:12:23 +00:00
Matt Amos
9cd381037a Fixed indeterminacy in test. 2009-04-30 18:09:54 +00:00
Matt Amos
5fe85e39a4 Fix failing test case. 2009-04-30 17:37:18 +00:00
Shaun McDonald
44c5248c1a couple of fixes to the changeset upload delete 2009-04-30 17:25:53 +00:00
Shaun McDonald
34381e56b7 give a id when a way is a member of a relation 2009-04-30 16:50:20 +00:00
Shaun McDonald
33d32bf737 We don't need an extra method for the amf controller for saving nodes, just catch the exception and do nothing with that exception. 2009-04-30 15:16:15 +00:00
Tom Hughes
088b4ae1e2 Do the statistics generation in a transaction. 2009-04-30 07:54:26 +00:00
Thomas Wood
2861236f60 Fix another error reporting bug similar to previous, again on printing RelationMember.id rather than RelationMember.relation.id 2009-04-30 07:10:57 +00:00
Thomas Wood
bb3108cb99 Fix grammar/referred relation id in precondition failed error.
From: "Precondition failed: The relation 5 is a used in relation 4,0."
To: "Precondition failed: The relation 5 is used in relation 4."
2009-04-30 06:52:14 +00:00
Thomas Wood
6a2fda5a99 Fix html: closing <a> tag. 2009-04-30 06:50:51 +00:00
Richard Fairhurst
41f85fb77d Potlatch 0.11a 2009-04-30 01:23:50 +00:00
Tom Hughes
5c734eb7ae Use :joins instead of :include to pull in the changesets - this does an
inner join instead of a left outer join (which is fine as all objects should
have a changeset) and more importantly stops rails generating a subquery
that doesn't work.
2009-04-29 23:45:54 +00:00
Shaun McDonald
db17af19bb fix more of the tests, particularly changeset controller. Needed more fixtures to fix them. The last failing changeset controller test needs some more work on the fixtures. 2009-04-29 22:25:49 +00:00
Shaun McDonald
dcca3ab0e9 More changeset test improvements. Another fixture was required for one of the tests 2009-04-29 17:29:58 +00:00
Matt Amos
3e9b6845d3 Fixed 'raw' raises by converting them to the appropriate OSM::APIError type. Made the error messages for placeholder fixing more informative. Added tests for these. 2009-04-29 10:07:35 +00:00
Tom Hughes
9acc6d3288 Eager load node and way details when processing a map call. 2009-04-28 16:26:06 +00:00
Tom Hughes
6d1c010213 Use the alias for the conditions as well... 2009-04-28 16:25:37 +00:00
Tom Hughes
074e5b0a11 Use an alias for current_relation_members to avoid clashing with
any attempt to eager load it.
2009-04-28 16:15:02 +00:00
Tom Hughes
4de6006567 Eager load nodes and node tags for the way when doing a getway call. 2009-04-28 15:55:54 +00:00
Tom Hughes
bcbbf1944b Don't bother running GC as it doesn't seem to get as much memory back
anyway plus the run_gc! method in the fastcgi dispatcher is a disaster
as it disables GC completely except for when it is forced by making a
call to the run_gc! method.
2009-04-28 14:07:51 +00:00
Tom Hughes
bf31791f65 Add a changeset cache to stop us looking up the same changeset over
and over again when processing a map call.
2009-04-28 13:40:30 +00:00
Tom Hughes
7ee10192eb Cope with sessions which don't exist. 2009-04-28 12:08:47 +00:00
Tom Hughes
c20f55045d Reject any AMF request which is not a POST request. 2009-04-28 11:14:15 +00:00
Tom Hughes
42359afa7e Fix session plugin work with the new ruby pg driver for postgresql. 2009-04-28 10:57:25 +00:00
Tom Hughes
04d0f45845 Remove debugging statement. 2009-04-28 09:00:01 +00:00
Tom Hughes
6f0b3ccbcd Don't log the contents of the changeset. 2009-04-28 08:59:33 +00:00
Thomas Wood
38c8e3e37e Quick fix to reference relation rather than relation_member when linking to the relation, not sure when the bug was introduced. Tests still need to be written for the browse controller.
Closes #1764
2009-04-27 21:26:23 +00:00
Thomas Wood
600d5b3a46 Further clarify descriptive texts regarding public editing. 2009-04-27 18:23:43 +00:00
Shaun McDonald
f47ba4fb23 Fix the node and relation tests from when the users with data public=false were disallowed from editing. Needed extra fixtures. 2009-04-27 11:57:58 +00:00