Commit Graph

1117 Commits

Author SHA1 Message Date
Tim Almdal
1a12a5e3c8 Create a Rest_Exception class and use it to convey status to the client instead of calling rest::forbidden and other rest helper error messages. 2009-12-31 11:51:51 -08:00
Tim Almdal
732047e9c3 Create helper functions to create a test user, an album or image. Don't create the test objects in the setup, but do it in each test. 2009-12-31 09:56:41 -08:00
Tim Almdal
4b44600bf9 Change the gallery_rest::_validate() method to use the form rules in Item_Model. Change the Duplicate errors to sentence case. And generally clean up the flow in _validate(). 2009-12-31 09:01:49 -08:00
Tim Almdal
11792a12bb 1) Remove the rest::not_found method and replace it with "throw new Kohana_404_Exception
2) Don't use the input path to lookup the item via relative_path_cache.  Instead use url::get_item_from_uri method.
2009-12-30 17:08:01 -08:00
Tim Almdal
d6ddbd1a31 Rollback the refactoring of the update into a helper method. Also remove the refactoring for check for commits 2009-12-30 16:12:32 -08:00
Tim Almdal
d50b753199 Merge branch 'master' into talmdal_dev 2009-12-30 15:52:18 -08:00
Tim Almdal
399c5c21f6 Force the 'Select Photos...' button to always be in the center of the upload dialog with the flash object overtop of it. Fixes ticket: #908. 2009-12-30 11:47:34 -08:00
Tim Almdal
55eeb8336f Change the file proxy to use the expires helper to manage content expiration. Fixes ticket #953. 2009-12-30 09:55:28 -08:00
Tim Almdal
2e98825c25 Merge branch 'master' into talmdal_dev 2009-12-30 07:57:23 -08:00
Tim Almdal
41969cc9e4 Another holdover from the K2.4 conversion. In R2.4 the url::current(true) was returning an empty string. This fixes ticket #955. 2009-12-29 15:48:21 -08:00
Tim Almdal
5925e586ba Merge branch 'master' into talmdal_dev 2009-12-28 11:27:43 -08:00
Bharat Mediratta
754c531c7e Only mark a variable as empty if its value is null. So 0 shows as 0. 2009-12-27 13:37:39 -08:00
Bharat Mediratta
fc5d1e5d74 Fix a bug where we weren't replacing table names when there's no
prefix.  This is wrong because even when there's no prefix we have to
get rid of the {curly} braces.
2009-12-27 12:41:52 -08:00
Tim Almdal
bccb6fc021 Clean up validation the check for duplicate names or slugs, finish converting the rest API to Kohana 2.4 2009-12-27 08:32:12 -08:00
Tim Almdal
07e83718a0 Forgot to commit local changes to item helper for K2.4 2009-12-26 11:26:44 -08:00
Tim Almdal
3060a6f662 Merge branch 'master' into talmdal_dev
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
2009-12-26 11:24:50 -08:00
Bharat Mediratta
73aeed8902 indentation fix. 2009-12-24 20:08:04 -08:00
Tim Almdal
4268889fbf Update the gallery_rest handlers test to pass the path in as an array in the request arguments property instead of the path property. 2009-12-24 19:24:22 -08:00
Bharat Mediratta
24ef52eccb whitespace fix 2009-12-24 18:06:26 -08:00
Bharat Mediratta
057e8d09af Convert a bunch of leftover kohana::show_404 calls to throw
Kohana_404_Exception instead.  These are the ones where we used a
lower-case 'k' so my previous filter didn't catch it.
2009-12-23 20:51:33 -08:00
Bharat Mediratta
b62083bd24 Cleaner version. Probably has a bunch of cruft in it, but it looks good enough. 2009-12-23 20:48:50 -08:00
Bharat Mediratta
29f982679d First shot at integrating the K24 error page. 2009-12-23 20:36:38 -08:00
Tim Almdal
d0dd6650be When normalizing the rest request don't assume that the additional arguments are acutall a path. Leave it up to the handler to determine. 2009-12-23 13:13:03 -08:00
Tim Almdal
d622d1aa4f Updated the unit tests to match the current API
Corrected a problem identified with the unit tests... failed if the path was empty on PUT.
2009-12-23 09:32:32 -08:00
Bharat Mediratta
ffca63235a Fix where tuple sent to descendant_counts() -- it needs to be wrapped in an array 2009-12-22 21:18:31 -08:00
Bharat Mediratta
63fd9622c0 Don't use as_array() on the result from db::build()->execute() -- it's no longer necessary. 2009-12-22 16:50:15 -08:00
Bharat Mediratta
0bc92614d3 Checkpoint 2009-12-22 16:48:18 -08:00
Bharat Mediratta
6601bb29d9 Update. 2009-12-22 16:25:31 -08:00
Bharat Mediratta
a6da027aad The default value for $offset should always be null (according to the
new K24 ORM).

Fix up a bad where tuple in the test.
2009-12-22 16:22:24 -08:00
Bharat Mediratta
71e154b674 Use a Database_Expression to handle the MAX() function. 2009-12-22 16:13:08 -08:00
Bharat Mediratta
fda4227bb1 Latest K24 does not automatically add an id attribute to every form
element with the same value as the name.  Yay!  That was a weird and
unexpected behavior.
2009-12-22 14:00:52 -08:00
Bharat Mediratta
ca293db214 Don't rely on implicit object -> id conversion, that doesn't work with K24's Database_Builder::where() 2009-12-22 13:57:49 -08:00
Bharat Mediratta
0650109d4b Add merge_or_where() to MY_Datatabase_Builder and use that instead of
or_where() for compatibility and convenience.  Caught by failing unit
tests.
2009-12-22 13:50:52 -08:00
Bharat Mediratta
7118f84aa9 ORM::factory() in K24 does not allow you to specify an alternate key
for lookup.  So instead of doing:
  ORM::factory("foo", array("some_key" => "some_value"))

you have to do:
  ORM::factory("foo"->where("some_key", "=" "some_value")->find()
2009-12-22 13:32:02 -08:00
Tim Almdal
cbe5a89a9f Update the api so it allows images to be uploaded. 2009-12-22 12:32:27 -08:00
Bharat Mediratta
8b9a02084a Updates for the latest version of Kohana 2.4:
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
2009-12-21 21:27:43 -08:00
Bharat Mediratta
9c5df1d31b Fix preambles, and fix the File_Structure_Test to be more lenient
because of preamble variation in K24.
2009-12-21 19:59:44 -08:00
Bharat Mediratta
e0dc520648 Updated for recent K24 Forge changes. 2009-12-21 17:26:24 -08:00
Bharat Mediratta
cc4d7c672c Update database tests for K24. Use a mock database that we load
through the framework so that we're properly testing the
Database_Builder, it's a lot cleaner than what we had before.
2009-12-21 15:47:11 -08:00
Bharat Mediratta
e1f43ad403 Updated for K24 2009-12-21 12:22:19 -08:00
Bharat Mediratta
5df1dc135b Fix some bugs in the cache database driver, and update the tests for K24. 2009-12-21 12:13:25 -08:00
Bharat Mediratta
bfcd99f3f2 Updated for K24 2009-12-21 11:30:34 -08:00
Bharat Mediratta
0cd03c8883 Add Database::set_default_instance() for tests 2009-12-21 11:30:26 -08:00
Bharat Mediratta
a22aa4ab05 Forgot to rename the file when I renamed the class. 2009-12-21 11:29:28 -08:00
Tim Almdal
fd7990735c Added validation to the edit functionality, since we can't trust any input 2009-12-21 11:25:11 -08:00
Tim Almdal
213f718e59 Merge branch 'master' into talmdal_dev 2009-12-18 15:00:01 -08:00
Bharat Mediratta
6f063aceac Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-18 14:27:58 -08:00
Bharat Mediratta
86e0bc863a Use url::base() instead of item::root()->url because we can't be sure
that will work (if your database is sitll at Beta 1, you don't have
the slug column, for example).
2009-12-18 14:26:15 -08:00
Tim Almdal
c804279647 Add the parent path to the resource 2009-12-18 12:58:23 -08:00
Tim Almdal
eb55a3c977 Add the name field to remote interface. 2009-12-18 12:21:10 -08:00