]>
git.openstreetmap.org Git - rails.git/log
Thomas Wood [Thu, 7 May 2009 22:52:02 +0000 (22:52 +0000)]
Commit bits of missing css that were required in previous upload.
Thomas Wood [Thu, 7 May 2009 22:48:14 +0000 (22:48 +0000)]
De-duplicate some of the changeset stuff out to a new partial view.
Add css hooks for upcoming fix for #1734
Shaun McDonald [Thu, 7 May 2009 17:57:59 +0000 (17:57 +0000)]
Some more tests
Tom Hughes [Thu, 7 May 2009 17:54:52 +0000 (17:54 +0000)]
Add foreign key constraints for users.
Shaun McDonald [Thu, 7 May 2009 14:10:17 +0000 (14:10 +0000)]
fix typo which meant that it was testing the node twice, rather than the node then the node history
Thomas Wood [Wed, 6 May 2009 21:08:50 +0000 (21:08 +0000)]
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.
Thomas Wood [Wed, 6 May 2009 19:55:25 +0000 (19:55 +0000)]
One final (I've checked the rest now!) mis-referenced id, plus make the error msg simpler.
Shaun McDonald [Wed, 6 May 2009 17:56:10 +0000 (17:56 +0000)]
fixing the tests I broke earlier due to the fixture changes
Shaun McDonald [Wed, 6 May 2009 14:58:48 +0000 (14:58 +0000)]
More trace tests
Matt Amos [Wed, 6 May 2009 10:35:39 +0000 (10:35 +0000)]
Potential fix for slow relation precondition checking based on Frederik's suggestion on the list to only check new members.
Shaun McDonald [Tue, 5 May 2009 18:31:37 +0000 (18:31 +0000)]
some tests for the site and export controllers
Shaun McDonald [Tue, 5 May 2009 17:07:06 +0000 (17:07 +0000)]
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.
Richard Fairhurst [Mon, 4 May 2009 23:37:06 +0000 (23:37 +0000)]
Potlatch 0.11b
Thomas Wood [Mon, 4 May 2009 22:42:07 +0000 (22:42 +0000)]
Sort the tags for the databrowser output.
Thomas Wood [Sat, 2 May 2009 18:28:39 +0000 (18:28 +0000)]
Fix another mis-referenced error message id!
Thomas Wood [Sat, 2 May 2009 00:26:37 +0000 (00:26 +0000)]
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
Tom Hughes [Fri, 1 May 2009 23:20:53 +0000 (23:20 +0000)]
Get rid of foreign_class specification which is no longer needed.
Thomas Wood [Fri, 1 May 2009 21:01:02 +0000 (21:01 +0000)]
Fix indentation fail
Thomas Wood [Fri, 1 May 2009 20:49:51 +0000 (20:49 +0000)]
Fix AMF controller failing tests due to changed error messages.
Shaun McDonald [Fri, 1 May 2009 10:29:19 +0000 (10:29 +0000)]
a fix for the relation controller test
Tom Hughes [Thu, 30 Apr 2009 23:45:55 +0000 (23:45 +0000)]
Use association names with :joins instead of writing the SQL for the
join by hand.
Matt Amos [Thu, 30 Apr 2009 18:12:23 +0000 (18:12 +0000)]
Fixed bad coding practice in test.
Matt Amos [Thu, 30 Apr 2009 18:09:54 +0000 (18:09 +0000)]
Fixed indeterminacy in test.
Matt Amos [Thu, 30 Apr 2009 17:37:18 +0000 (17:37 +0000)]
Fix failing test case.
Shaun McDonald [Thu, 30 Apr 2009 17:25:53 +0000 (17:25 +0000)]
couple of fixes to the changeset upload delete
Shaun McDonald [Thu, 30 Apr 2009 16:50:20 +0000 (16:50 +0000)]
give a id when a way is a member of a relation
Shaun McDonald [Thu, 30 Apr 2009 15:16:15 +0000 (15:16 +0000)]
We don't need an extra method for the amf controller for saving nodes, just catch the exception and do nothing with that exception.
Tom Hughes [Thu, 30 Apr 2009 07:54:26 +0000 (07:54 +0000)]
Do the statistics generation in a transaction.
Thomas Wood [Thu, 30 Apr 2009 07:10:57 +0000 (07:10 +0000)]
Fix another error reporting bug similar to previous, again on printing RelationMember.id rather than RelationMember.relation.id
Thomas Wood [Thu, 30 Apr 2009 06:52:14 +0000 (06:52 +0000)]
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."
Thomas Wood [Thu, 30 Apr 2009 06:50:51 +0000 (06:50 +0000)]
Fix html: closing <a> tag.
Richard Fairhurst [Thu, 30 Apr 2009 01:23:50 +0000 (01:23 +0000)]
Potlatch 0.11a
Tom Hughes [Wed, 29 Apr 2009 23:45:54 +0000 (23:45 +0000)]
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.
Shaun McDonald [Wed, 29 Apr 2009 22:25:49 +0000 (22:25 +0000)]
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.
Shaun McDonald [Wed, 29 Apr 2009 17:29:58 +0000 (17:29 +0000)]
More changeset test improvements. Another fixture was required for one of the tests
Matt Amos [Wed, 29 Apr 2009 10:07:35 +0000 (10:07 +0000)]
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.
Tom Hughes [Tue, 28 Apr 2009 16:26:06 +0000 (16:26 +0000)]
Eager load node and way details when processing a map call.
Tom Hughes [Tue, 28 Apr 2009 16:25:37 +0000 (16:25 +0000)]
Use the alias for the conditions as well...
Tom Hughes [Tue, 28 Apr 2009 16:15:02 +0000 (16:15 +0000)]
Use an alias for current_relation_members to avoid clashing with
any attempt to eager load it.
Tom Hughes [Tue, 28 Apr 2009 15:55:54 +0000 (15:55 +0000)]
Eager load nodes and node tags for the way when doing a getway call.
Tom Hughes [Tue, 28 Apr 2009 14:07:51 +0000 (14:07 +0000)]
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.
Tom Hughes [Tue, 28 Apr 2009 13:40:30 +0000 (13:40 +0000)]
Add a changeset cache to stop us looking up the same changeset over
and over again when processing a map call.
Tom Hughes [Tue, 28 Apr 2009 12:08:47 +0000 (12:08 +0000)]
Cope with sessions which don't exist.
Tom Hughes [Tue, 28 Apr 2009 11:14:15 +0000 (11:14 +0000)]
Reject any AMF request which is not a POST request.
Tom Hughes [Tue, 28 Apr 2009 10:57:25 +0000 (10:57 +0000)]
Fix session plugin work with the new ruby pg driver for postgresql.
Tom Hughes [Tue, 28 Apr 2009 09:00:01 +0000 (09:00 +0000)]
Remove debugging statement.
Tom Hughes [Tue, 28 Apr 2009 08:59:33 +0000 (08:59 +0000)]
Don't log the contents of the changeset.
Thomas Wood [Mon, 27 Apr 2009 21:26:23 +0000 (21:26 +0000)]
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
Thomas Wood [Mon, 27 Apr 2009 18:23:43 +0000 (18:23 +0000)]
Further clarify descriptive texts regarding public editing.
Shaun McDonald [Mon, 27 Apr 2009 11:57:58 +0000 (11:57 +0000)]
Fix the node and relation tests from when the users with data public=false were disallowed from editing. Needed extra fixtures.
Shaun McDonald [Mon, 27 Apr 2009 11:49:56 +0000 (11:49 +0000)]
Improve the node/way/relation already deleted error message, and get rid bug in way model with missing new in exception
Tom Hughes [Sun, 26 Apr 2009 23:27:40 +0000 (23:27 +0000)]
Finish removing old request counting logic.
Tom Hughes [Sun, 26 Apr 2009 23:14:20 +0000 (23:14 +0000)]
Remove old code to exit after 10000 requests as the memory limit code
should do a better job of controlling things.
Tom Hughes [Sun, 26 Apr 2009 23:13:06 +0000 (23:13 +0000)]
Tidy up.
Shaun McDonald [Sun, 26 Apr 2009 22:46:41 +0000 (22:46 +0000)]
Make node update work with the new require data public to edit policy. Added convenience testing method for the require data public. Add 2 new fixtures that are owned by the public user.
Shaun McDonald [Sun, 26 Apr 2009 21:11:31 +0000 (21:11 +0000)]
Make the report_error function support any http status code for added flexibility.
Shaun McDonald [Sun, 26 Apr 2009 20:56:58 +0000 (20:56 +0000)]
Fix typo of missing .new for some of the errors. Tests are useful.
Richard Fairhurst [Sun, 26 Apr 2009 18:26:48 +0000 (18:26 +0000)]
move relations mapping out of way/node objects, so we don't need horrible expensive getrelations any more
Tom Hughes [Sun, 26 Apr 2009 17:01:59 +0000 (17:01 +0000)]
Run GC if we hit the memory limit, and only restart if we are still too big.
Tom Hughes [Sun, 26 Apr 2009 16:56:40 +0000 (16:56 +0000)]
Increase the hard memory limit and set a lower soft limit that does a
clean restart between requests.
Tom Hughes [Sun, 26 Apr 2009 11:28:55 +0000 (11:28 +0000)]
Do a GC run every 10 requests.
Tom Hughes [Sat, 25 Apr 2009 22:26:56 +0000 (22:26 +0000)]
Null descriptions are not allowed.
Matt Amos [Sat, 25 Apr 2009 15:20:48 +0000 (15:20 +0000)]
Fixed bug in exception creation.
Richard Fairhurst [Fri, 24 Apr 2009 20:40:48 +0000 (20:40 +0000)]
ibid
Richard Fairhurst [Fri, 24 Apr 2009 20:12:43 +0000 (20:12 +0000)]
a couple of minor revert fixes
Matt Amos [Fri, 24 Apr 2009 18:47:41 +0000 (18:47 +0000)]
Fixed dumb copy-and-paste mistake.
Richard Fairhurst [Fri, 24 Apr 2009 17:44:52 +0000 (17:44 +0000)]
pass common API error text through to Potlatch so it can be shown to the user
Richard Fairhurst [Fri, 24 Apr 2009 14:46:52 +0000 (14:46 +0000)]
lots of relations changes for speed and version management
Matt Amos [Fri, 24 Apr 2009 10:08:15 +0000 (10:08 +0000)]
Patching better 412 error messages from mis-commit on old api06 branch.
Tom Hughes [Thu, 23 Apr 2009 23:46:45 +0000 (23:46 +0000)]
Backout broken attempt at making case insensitive authentication work
on Postgres. As implemented this forces a table scan to authenticate
users which is ridiculous to save people pressing the shift key.
Shaun McDonald [Thu, 23 Apr 2009 21:03:59 +0000 (21:03 +0000)]
The render method needs to be last, otherwise the error header won't get set. Needs tests.
Shaun McDonald [Thu, 23 Apr 2009 19:20:08 +0000 (19:20 +0000)]
Hack a way to make the email and display name case insensitive for logging in, based on a suggestion by firefishy to use ILIKE. Changes requested from users on mailing list. Includes some tests to check the case insensitivity of the username, and and e-mail address on login.
Matt Amos [Thu, 23 Apr 2009 18:39:36 +0000 (18:39 +0000)]
Added better error messages on 412 precondition failed.
Richard Fairhurst [Thu, 23 Apr 2009 17:54:17 +0000 (17:54 +0000)]
fix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility via ExternalInterface (we can use this later to alert for a commit message if none is provided)
Harry Wood [Thu, 23 Apr 2009 14:38:40 +0000 (14:38 +0000)]
change updatelinks params so that Potlatch can pass in the view bbox. Also check if it's missing. closes #1738
Richard Fairhurst [Thu, 23 Apr 2009 12:01:42 +0000 (12:01 +0000)]
actually delete nodes on deleteway (might help)
Richard Fairhurst [Thu, 23 Apr 2009 08:32:26 +0000 (08:32 +0000)]
fix nodes bug
Grant Slater [Thu, 23 Apr 2009 02:00:15 +0000 (02:00 +0000)]
lighttpd increase server.max-fds from 1024 (default) to 8192 after lighttpd deadlock.
Richard Fairhurst [Wed, 22 Apr 2009 23:57:37 +0000 (23:57 +0000)]
fix word-wrap in "close changeset" dialogue
Richard Fairhurst [Wed, 22 Apr 2009 19:42:22 +0000 (19:42 +0000)]
remove debug stuff
Richard Fairhurst [Wed, 22 Apr 2009 17:47:06 +0000 (17:47 +0000)]
change relation_member 'type' case, to match change in database
Thomas Wood [Wed, 22 Apr 2009 17:08:04 +0000 (17:08 +0000)]
Fix multiple issues with links to /history from the homepage. Thanks to Ed Avis for bringing this to our attention.
Shaun McDonald [Wed, 22 Apr 2009 14:38:23 +0000 (14:38 +0000)]
Fixing the create relation test, which now also tests to make sure that private users cannot edit.
Tom Hughes [Wed, 22 Apr 2009 13:41:17 +0000 (13:41 +0000)]
Use postgres interval syntax.
Tom Hughes [Wed, 22 Apr 2009 13:34:12 +0000 (13:34 +0000)]
The active flag is still an integer for some reason, not a boolean.
Closes #1727.
Shaun McDonald [Wed, 22 Apr 2009 11:03:22 +0000 (11:03 +0000)]
adding the maximum number of elements in a changeset to the capabilities call, including test update
Richard Fairhurst [Wed, 22 Apr 2009 08:37:55 +0000 (08:37 +0000)]
bit more debug
Richard Fairhurst [Wed, 22 Apr 2009 08:25:33 +0000 (08:25 +0000)]
add temporary relations debug code
Richard Fairhurst [Wed, 22 Apr 2009 07:41:21 +0000 (07:41 +0000)]
remove Bavaria
Shaun McDonald [Wed, 22 Apr 2009 00:42:23 +0000 (00:42 +0000)]
fixing some of the relation tests. Some adjustments to the fixtures.
Richard Fairhurst [Tue, 21 Apr 2009 23:59:27 +0000 (23:59 +0000)]
ibid
Frederik Ramm [Tue, 21 Apr 2009 23:55:02 +0000 (23:55 +0000)]
there is not HTML attribute named "padding". either use "cellpadding" (this patch), or use the CSS attribute (i.e. style="padding: 0px").
Matt Amos [Tue, 21 Apr 2009 23:40:27 +0000 (23:40 +0000)]
Quick and dirty fix for relation tags issue.
Frederik Ramm [Tue, 21 Apr 2009 23:38:43 +0000 (23:38 +0000)]
modified "user" link in "recent changes" list to point directly to user's list of changes which is what you expect in this context, rather than going to that user's user page and having to click "edits" there.
Richard Fairhurst [Tue, 21 Apr 2009 23:36:53 +0000 (23:36 +0000)]
fix id/relid inconsistency
Tom Hughes [Tue, 21 Apr 2009 23:35:19 +0000 (23:35 +0000)]
Fixed search controller to have some chance of working.
Tom Hughes [Tue, 21 Apr 2009 21:54:44 +0000 (21:54 +0000)]
Force selection to fail when no traces match the tag.
Tom Hughes [Tue, 21 Apr 2009 21:51:02 +0000 (21:51 +0000)]
Don't generate an IN condition with an empty list.
Tom Hughes [Tue, 21 Apr 2009 21:37:27 +0000 (21:37 +0000)]
Use correct names for member types.
Thomas Wood [Tue, 21 Apr 2009 21:30:37 +0000 (21:30 +0000)]
Fix bbox display again, how do we keep mixing our lons and lats?