Tim Almdal
40d496edee
Remove extra debug statement in rest_controller::access_key() and restructure the Rest_Tag_Helper_Test to only create items as required for test in each test.
2009-12-31 13:24:00 -08:00
Tim Almdal
0bb13da25a
Add quotes to the module name
2009-12-31 12:47:18 -08:00
Tim Almdal
4611eb2142
Move the set_active_user and normalize_request methods to rest.php helper
2009-12-31 12:32:54 -08:00
Tim Almdal
af10f0abcf
Only create the user or the target photo in the tests that require it.
2009-12-31 12:24:46 -08:00
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
e6111e616b
Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev
2009-12-30 16:13:13 -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
7af844606d
The problem occurs because the square brackets are treated as special characters in the glob to find the children. This patch escapes the square brackets. Fixes ticket #855
2009-12-30 15:33:22 -08:00
Bharat Mediratta
5d6e264211
whitespace.
2009-12-30 12:07:24 -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
7e8985d0e8
Found another where statement that required converting
2009-12-29 15:26:18 -08:00
Tim Almdal
5925e586ba
Merge branch 'master' into talmdal_dev
2009-12-28 11:27:43 -08:00
Bharat Mediratta
38f2784fbb
Allow users to upscale images in the slideshow by making the maxScale
...
parameter configurable in Admin > Settings > Advanced.
You specify the scaling factor. Normally, images fill the stage; 0 ->
never scale up; any other positive number S --> scale up to S times
the original size of the photo (but never bigger than the stage)
2009-12-27 13:40:38 -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
31bb09c9b6
Change ->in(...) ->where('id', 'in', ...)
2009-12-27 12:10:37 -08:00
Tim Almdal
0a482127b2
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/organize/js/organize.js
2009-12-27 08:35:19 -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
Bharat Mediratta
55f9408d50
Fix the scrollbar in the organize panel by restricting drag-to-select to #g-organize-microthumb-grid.
2009-12-26 15:08:14 -08:00
Bharat Mediratta
5808ba48c8
Roll forward to the new CoolIris slideshow -- it appears to be ready
...
now.
2009-12-26 13:26:29 -08:00
Bharat Mediratta
e885ca161f
Reuse $theme->item() for our descendants_count() call.
2009-12-26 13:21:16 -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
da7ee6ab30
Fix over-targetting in CSS
2009-12-25 13:24:47 -08:00
Bharat Mediratta
07a9ef2276
Convert some database calls
2009-12-25 13:24:38 -08:00
Bharat Mediratta
c50c2d135c
Fix uses of count_records() and use ORM to count instead.
2009-12-25 12:39:09 -08:00
Bharat Mediratta
73aeed8902
indentation fix.
2009-12-24 20:08:04 -08:00
Tim Almdal
586f2d78b8
Add the functionality to add, delete and rename tags via the Gallery3 remote interface.
2009-12-24 19:25:14 -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
Tim Almdal
a2a3741b53
Change the image block rest handler to expect the type (i.e. random) as a parameter not part of the path.
2009-12-24 11:36:00 -08:00
Bharat Mediratta
b16ab9d94a
Don't treat objects like strings.
2009-12-24 03:08:06 -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
cf6de01f1e
Provide a REST interface to retrieve tags or tagged items.
...
GET /tag?limit=nn,offset=nn Retrieve all tags sorted by count descending
GET /tag/uri/uri/uri Retrieve all the tags for the resource specified by path
GET /tag/t1/t2/t3 Retrieve all the items that have the specified tags
Can specifiy limit and offset to limit response size
2009-12-23 14:20:23 -08:00
Bharat Mediratta
eb047d7f5d
ORM relations now require you to do find_all() or count_all() to get the results.
2009-12-23 13:31:52 -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
Tim Almdal
b8ee6f25bd
Add a restful get random image block
2009-12-22 18:55:03 -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