Commit graph

1216 commits

Author SHA1 Message Date
Matt Amos
b56f57ec43 Fixed up delete methods on nodes, ways and relations to return the new version number and added some more tests. 2008-10-14 14:27:12 +00:00
Shaun McDonald
2c16177174 adding changeset stuff for the data browser 2008-10-13 20:48:58 +00:00
Matt Amos
cf24a5a3ee Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to disallow duplicate tag keys. 2008-10-13 17:50:15 +00:00
Shaun McDonald
9e1946b283 now you will actually save the changeset on updating ways. Showing the changeset in the data browser detail. 2008-10-13 17:05:52 +00:00
Shaun McDonald
1d4a957c79 fix so that changeset will be closed without an exception due to double validation 2008-10-13 16:11:57 +00:00
Matt Amos
3549d8900f All API 0.6 functional tests now pass. 2008-10-13 15:46:22 +00:00
Matt Amos
1e5782f579 Fixed up way controller tests for API 0.6. 2008-10-13 15:40:32 +00:00
Shaun McDonald
fb5f39f19a Creating consistency check for creation of nodes, way and relations. Moving some creation code from the controller to the model, and adding error handling on create errors. 2008-10-13 15:39:21 +00:00
Matt Amos
127bb4523e Fixed problems with the relations functional tests. 2008-10-13 15:23:48 +00:00
Matt Amos
b38b2c2d0f Fixed xml method of old way model. 2008-10-13 14:38:32 +00:00
Shaun McDonald
b91b514cf2 moving the check consistency to it's own file so that checks will be able to be loaded into the way and relation models, without loading the node stuff. 2008-10-13 14:34:04 +00:00
Matt Amos
2d373c6f20 Fix to_xml method of old_relation model. 2008-10-13 14:29:30 +00:00
Matt Amos
a2498928e4 Fixed node functional tests. A couple of changes to the old_node model and node controller for changesets. 2008-10-13 14:08:31 +00:00
Shaun McDonald
734cbb967d fixing the data browser to be able to cope with the changeset change. changeset browsing still needs to be implemented. Also giving a nice error message for 404 not found instead of rendering nothing. 2008-10-13 12:08:26 +00:00
Shaun McDonald
24b21e4a29 additional consistency checks. making the error message for the number of nodes use the configured number of nodes, rather than a hard coded number. minor improvements to the way controller functional tests. Not sure if they should be turned into integration tests. 2008-10-12 22:32:51 +00:00
Shaun McDonald
233a97bfcb fix indentation. Get teh api version from the constant, rather than hard coding it. Using right save method, so that exception is thrown. Some comment questions. 2008-10-10 18:24:07 +00:00
Shaun McDonald
4da22eee1a reverting the javascript change in changeset 10926, that needs to be specific to each rails setup (if run out of another dir), until we turn the file into an erb that can insert the rails root into the javascript file 2008-10-10 13:27:21 +00:00
Shaun McDonald
34bc4686cd Some comment about where to add code to get some more of the functional changesets working. 2008-10-10 07:58:33 +00:00
Shaun McDonald
3d24694add moving the conistency checks for updates and deletes to library, hopefully got the updates and deletes working now. 2008-10-09 16:22:05 +00:00
Matt Amos
2c5f6740c7 Small fixes to unit tests where user_id has become changeset_id. 2008-10-09 10:19:16 +00:00
Shaun McDonald
2b7a40069f adding the controller code to be able to get a specific version of a node, way or relation. Add some node checks on update. Some code indentation cleanup. 2008-10-08 18:03:41 +00:00
Shaun McDonald
e1b205913c Fix the data config, so that the development database is not the same as the test database. Make a good stab at getting the creates and updates for relations working, adding some new error exceptions. Some code indentation cleanup. 2008-10-08 15:42:42 +00:00
Shaun McDonald
2347761266 some useful notes in code for ideas that require implementing. 2008-10-07 23:49:53 +00:00
Shaun McDonald
6bf25141de Adding the classic_pagination to svn as the svn external is no longer working 2008-10-07 22:59:59 +00:00
Shaun McDonald
b6a3e9671c Updating the fixtures for the new changesets 2008-10-07 22:40:28 +00:00
Shaun McDonald
5adc9a45ef folder empty and components are dead and gone with rails 2 anyway, so deleting this folder. 2008-10-07 22:11:05 +00:00
Shaun McDonald
328d47e506 Fixing a bug in my foreign keys. I can now upload and download nodes and ways using JOSM in the new API. 2008-10-03 17:09:58 +00:00
Shaun McDonald
5daeb1b063 Changing if not to unless to make code more readable. 2008-10-03 13:57:20 +00:00
Shaun McDonald
40414cf324 changing the belongs_to and has_many items in the models to reflect the new foriegn keys in the db and the fact that a (old)node/way/relation now belong to a changeset, which in turn has a user. 2008-09-30 18:21:56 +00:00
Shaun McDonald
d19076d0ed wrong foreign key command in the migration 2008-09-30 15:52:54 +00:00
Shaun McDonald
7252ffa820 wrong foreign key command in the migration 2008-09-30 15:44:55 +00:00
Shaun McDonald
d7289a06de using the wrong field name in one of the migrations 2008-09-30 15:24:25 +00:00
Shaun McDonald
20022e457f changing the changesets migrations, so that the user id is now the changeset id for the nodes/ways/relations 2008-09-30 14:29:44 +00:00
Shaun McDonald
0ec26f14a0 adding some version reading for the nodes 2008-09-29 16:28:51 +00:00
Shaun McDonald
56c972577b fixing hard coded images/scripts, so that the site works better when deploy as a sub directory using passenger phusion. 2008-09-26 15:17:30 +00:00
Shaun McDonald
6dfc83da03 fixing the test that was broken in the resync 2008-09-25 16:20:36 +00:00
Shaun McDonald
629843b96b Minor fix for the migration that was moved 2008-09-25 15:57:59 +00:00
Shaun McDonald
d9e070e069 Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved. 2008-09-25 15:06:05 +00:00
Tom Hughes
c2854a8056 Get rails to do asset tagging for the SWF file. 2008-09-25 03:58:18 +00:00
Richard Fairhurst
98d49ed144 Potlatch 0.10c... part two 2008-09-20 12:07:48 +00:00
Richard Fairhurst
eb7862b4c6 Potlatch 0.10c 2008-09-18 17:04:28 +00:00
Tom Hughes
4c2f24440d Add the noname layer to the main map. 2008-09-09 17:50:09 +00:00
Tom Hughes
d6b05a8da9 Run web authorisation for all non-api requests. Closes #1152. 2008-09-07 15:07:44 +00:00
Tom Hughes
fd6ff4ef3b Update for new cycle map location. 2008-08-28 23:09:42 +00:00
Tom Hughes
3c85b2ceea Fix migration. 2008-08-24 16:56:34 +00:00
Tom Hughes
34189cf761 Add basic support for logically deleting a user. 2008-08-24 16:53:42 +00:00
Tom Hughes
791062569d Tidy up diary code a bit. 2008-08-24 15:12:20 +00:00
Richard Fairhurst
3b6d2c5336 edit diary entries 2008-08-21 21:40:23 +00:00
Shaun McDonald
87494900df more testing of node tags 2008-08-18 13:55:21 +00:00
Tom Hughes
1fb4e929bd Commit new route for email confirmation changes. 2008-08-18 07:28:26 +00:00