stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
3624 Commits
Author SHA1 Message Date
Bharat Mediratta 318c86ab56 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-21 20:38:25 -08:00
Tim Almdal 0da5d9e606 Internationalize all strings in admin_modules.hmtl and corrected comments. 2010-01-21 20:33:26 -08:00
Bharat Mediratta 8788880065 We don't need CSRF in Rest_Controller::__call() because we use access tokens. 2010-01-21 20:18:19 -08:00
Bharat Mediratta 6be5a71cc2 Actually deny permissions in delete_item_from_tag_fails_without_permissions_test().. 2010-01-21 20:16:57 -08:00
Bharat Mediratta a0c9979418 whitespace. 2010-01-21 20:12:28 -08:00
Bharat Mediratta 709d797408 Make sure that we actually don't have permissions, to avoid contamination w/ other tests. 2010-01-21 20:10:45 -08:00
Bharat Mediratta f7f4df64b9 Exclude modules/gallery_unit_test/views/kohana/error.php 2010-01-21 20:04:46 -08:00
Bharat Mediratta 2f9077e26a Simplify the test using the test helper. 2010-01-21 19:08:40 -08:00
Bharat Mediratta 40b17474bb Add random_group(). 2010-01-21 19:08:29 -08:00
Bharat Mediratta 313f816818 Fix a minor bad expectation. 2010-01-21 19:06:32 -08:00
Bharat Mediratta b278f9680c Can't call ORM_MPTT::move_to() externally, so call Item_Model::save() instead. 2010-01-21 19:05:53 -08:00
Tim Almdal ff2d81b7c3 Convert the slideshow module to use the new check environment and pre_deactivate api methods. 2010-01-21 13:03:58 -08:00
Tim Almdal d59c6ed4f1 The admin module controller allows modules to provide a check_environment method 
which is called prior to installation.  The method allows the module to provide
an error message or warnings if the module can not be installed or activated
without issues.  The admin module controller also will fire a pre_deactivate
event, which allows modules to indicate issues that may arise be deactivating the
specified module.

These messages are displayed in a dialog box prior to installation in order to
allow the gallery administrator to determine the appropriate action before proceeding.

Lays the foundation for implementing a fix for ticket #937
 2010-01-21 12:57:45 -08:00
Bharat Mediratta 1e35cf28ee Reload the album after adding the photo so that MPTT pointers are correct. 2010-01-21 08:29:30 -08:00
Bharat Mediratta dde429f71e Whitespace. 2010-01-20 23:49:20 -08:00
Bharat Mediratta 16ccda0f3d Two fixes: 
1) Don't call ORM_MPTT::move_to() directly.  Use the new
   model-based-validation approach of changing the parent_id and saving.

2) Item_Model::parent() can return null; check for it.
 2010-01-20 23:49:10 -08:00
Bharat Mediratta e2b6cfc2d9 Make move_to protected since we don't want folks calling it on 
Item_Model.  If there's a need to make this public, we should override
it in Item_Model and throw an exception there.
 2010-01-20 23:47:48 -08:00
Bharat Mediratta 46d4d778ad Remove debug code. 2010-01-20 23:33:09 -08:00
Bharat Mediratta 949586c254 Oops, bug in save() -- we weren't returning the saved value! 2010-01-20 23:28:29 -08:00
Bharat Mediratta d3e3bbd713 improve comment. 2010-01-20 23:27:52 -08:00
Bharat Mediratta 8a1c17d869 Use the exception itself to print out a nice text message. 2010-01-20 23:14:51 -08:00
Andy Staudacher 6dd92cfa1c Fix maintenance tasks / language admin for bug introduced earlier by no longer casting in ORM. 
Task->done is now a string, boolean false is stored as integer 0 and loaded as string "0". On the client side that's interpreted as truthy in JavaScript.
Fix: cast "0" to (bool) before encoding to JSON.
 2010-01-20 23:12:36 -08:00
Bharat Mediratta 3f3159d25c Guard against missing/empty $description. 2010-01-20 23:05:51 -08:00
Bharat Mediratta 382214f3c1 Move the error page to the expected location for K24. 2010-01-20 23:00:39 -08:00
Bharat Mediratta f6c48d757c Delete MY_ORM::original(). We did not have proper containment to 
generate $original when we needed it, resulting in inconsistent
behavior.
 2010-01-20 22:56:37 -08:00
Bharat Mediratta b0ff4418d2 Stop using MY_ORM::original() 2010-01-20 22:55:22 -08:00
Bharat Mediratta f0780486ee Fix typo: edit_user -> add_user. 2010-01-20 22:53:51 -08:00
Bharat Mediratta b23f62259d Stop using MY_ORM::original(). 2010-01-20 22:52:11 -08:00
Bharat Mediratta feefdfd533 Stop using MY_ORM::original(). 2010-01-20 22:51:18 -08:00
Bharat Mediratta 6dc88be6b6 Stop using MY_ORM::original(). 2010-01-20 22:50:47 -08:00
Bharat Mediratta 00957f79ba Throw Kohana_Exception instead of Exception on access denied, since that may bubble all the way up 2010-01-20 22:46:46 -08:00
Bharat Mediratta 995faaa27f Stop using MY_ORM::original(). It's got very odd semantics and we are 
not capturing all cases for setting and resetting $original, which
leads to some weird and hard to reproduce behavior.

Instead, if we need the original just reload it from the database.
This may result in a somewhat excessive load in places, but we'll have
to fix that in a later optimization pass.
 2010-01-20 22:45:19 -08:00
Bharat Mediratta 2a41e27d49 Add random_tag(). 2010-01-20 21:15:57 -08:00
Bharat Mediratta 3a26ace065 Improve robustness in resolve() against bad urls.. 2010-01-20 21:15:44 -08:00
Bharat Mediratta 697d84457f Rewrite and greatly simplify the tests for the new tag_rest implementation. 2010-01-20 21:15:11 -08:00
Bharat Mediratta 3d4a6d6336 Remove unused untagging code from put() 
Add access permissions to delete()
Remove unnecessary return value from delete()
 2010-01-20 21:14:40 -08:00
Bharat Mediratta 210e02f000 Throw Rest exceptions, not regular exceptions. 2010-01-20 21:13:58 -08:00
Bharat Mediratta 8bf73d4b4c New test for tags_rest.php 2010-01-20 00:52:32 -08:00
Bharat Mediratta b5cf24456f Forbidden is a 403, not a 503. 2010-01-20 00:51:34 -08:00
Bharat Mediratta 276d7de5b6 Simplify and update for model based validation. 2010-01-20 00:14:05 -08:00
Bharat Mediratta 5f83da41e4 Rewrite the tests to be simpler and more direct. 2010-01-20 00:08:13 -08:00
Bharat Mediratta 5119d58e7f Move access key creation into a helper function. 2010-01-20 00:07:03 -08:00
Bharat Mediratta 66fbbab907 Add assert_array_equal_to_json(). 2010-01-20 00:06:36 -08:00
Bharat Mediratta b09450cf5d Let the Rest_Controller functions throw a Rest_Exception since 
the Kohana framework will handle it properly.
 2010-01-19 23:30:22 -08:00
Bharat Mediratta c65eca0607 Move rest::send_headers back into Rest_Exception. 2010-01-19 23:30:09 -08:00
Bharat Mediratta 92d96548e9 Make Rest_Exception extend Kohana_Exception so that we can let it 
bubble to the top and then in sendHeaders have it send the right
response code.
 2010-01-19 23:28:18 -08:00
Bharat Mediratta 76da85a1a0 Extend Gallery_Unit_Test_Case instead of Unit_Test_Case. 2010-01-19 22:38:19 -08:00
Bharat Mediratta a774dc5447 Don't send headers if they're already sent. 2010-01-19 22:38:03 -08:00
Bharat Mediratta fc4250f5d8 Use $input instead of Input::instance() 2010-01-19 22:37:38 -08:00
Bharat Mediratta 409c4dcc47 Do a better job of guarding against missing images. 2010-01-19 21:27:54 -08:00