Commit Graph
1604 Commits
Author SHA1 Message Date
Bharat Mediratta 61e31b6f77 Fix typo: change $entryr to $entry->user 2010-01-23 16:45:10 -08:00
Bharat Mediratta eb32e1052d Fix typo: change $entryr to $entry->user 2010-01-23 16:44:30 -08:00
Bharat Mediratta fecac4a859 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/tests/xss_data.txt
2010-01-23 16:29:10 -08:00
Bharat Mediratta 8849594aa1 Merge branch 'bharat_dev' of git@github.com:/gallery/gallery3 into bharat_dev 2010-01-23 16:23:50 -08:00
Bharat Mediratta ca5f625a5e Log validation errors. 2010-01-24 11:40:01 -08:00
Andy Staudacher c9b775c21a Fix for bug 984, consistently interpret installed / available locales as array.
On the current hostgater setup (PHP 5.2.12), locales::available() was returning an array and isset($locales->$code) would always (silently) return false.

Choosing array over stdClass since count($someStdClass) will always return 1, and not the number of object members.
2010-01-23 15:46:01 -08:00
Tim Almdal a1a3d4f595 Correct the javascript so it will find the "Continue" button in other languages than english. 2010-01-23 14:57:10 -08:00
Tim Almdal abdeb21ccb Add a user_menu method to the Admin_View and then use this method to get the
user menu.  Since the information displayed is identical in both admin and
theme views, it makes sense to combine the generation to it is done in a common
location.
2010-01-23 13:29:49 -08:00
Bharat Mediratta d4308e4d35 Updated 2010-01-23 12:16:04 -08:00
Bharat Mediratta a609694018 Update tests for recent REST changes. 2010-01-23 12:13:14 -08:00
Bharat Mediratta 4960061b56 Don't use ORM_MPTT::move_to directly, it's protected. 2010-01-23 11:35:26 -08:00
Tim Almdal 06ef3885b3 Increase the size of the 'select photos' button so that it doesn't wrap and set the size of the underlying flash object. 2010-01-23 09:23:08 -08:00
Tim Almdal ece403877f If the userid/password combination, render the full page instead of just printing the form. Fixes ticket #980. 2010-01-22 18:12:30 -08:00
Tim Almdal ff5ccf0fb3 Specify the height and overflow-y on l10n-client translation element. fixes ticket #899. 2010-01-22 14:38:58 -08:00
Tim Almdal 79bcfc93c3 Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-22 13:38:23 -08:00
Tim Almdal eabeeeb126 Trap any errors that may occur when trying to install a new identity provider and then reinstall the current one. 2010-01-22 13:38:05 -08:00
Tim Almdal df313cac56 Change the check_environment method in the module helper and the module installers to can_activate to reflect that it is doing more than just checking the environment. 2010-01-22 12:30:17 -08:00
Tim Almdal dabd5b84b2 Remove the identity manager screens and controller as alterntive identity providers are installed in the admin module screen. 2010-01-22 12:22:31 -08:00
Tim Almdal 1175783123 Disable the continue button after clicking so it can only clicked once. 2010-01-22 12:16:36 -08:00
Tim Almdal ae568b6182 Refactor the identity provider installation in to a common helper method (change_provider) with an initialization callback. 2010-01-22 12:09:11 -08:00
Tim Almdal 603c3049a1 Treat identity providers just like other modules and use the admin_module to
install and switch to a different identity provider.
2010-01-22 09:39:29 -08:00
Bharat Mediratta b37ef6e8d9 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-22 01:43:53 -08:00
Andy Staudacher 120c9c749e Change "fetch translations" task to fetch them in batches.
The request limit was in place already, but the client didn't respect it before, leading to unhappy users in case they had lots of 3rd party modules installed, or more than 2-3 locales enabled. This is all taken care of now.
2010-01-22 01:16:16 -08:00
Bharat Mediratta 25dc3e1a7b Moved to Item_Rest_Helper_Test.php 2010-01-22 01:11:03 -08:00
Bharat Mediratta 0efbfcbe61 Return the url of the newly created item from post().
Don't try to access ORM::$changed -- it's protected.
2010-01-22 01:10:31 -08:00
Bharat Mediratta cb8b31d70c Updated tests to pass after recent refactor of gallery_rest -> item_rest. 2010-01-22 00:49:05 -08:00
Bharat Mediratta 2744b2e938 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-22 00:27:56 -08:00
Bharat Mediratta bcf1caad14 Reshape the rest code to be more consistent with regards to
relationships.  Now when you view a resource, it has 4 top level
elements:

url: the url of this resource
resource: array of key value pairs describing the resource
members: array of urls to members of this collection
relationships: array of array of members.

Relationships are a special type of collection that links two
different resources together.  To remove a relationship, just
DELETE its url.  To create a relationship, POST to its
collection.

Individual modules can add their own relationships to any
resource via a callback mechanism.

Example:
  Array(
    [url] => http://g3.com/rest/item/1
    [resource] => Array (
      [id] => 1
      [album_cover_item_id] => 4
      [captured] =>
      [created] => 1264056417
      [description] =>
      [height] =>
      ...
    )
    [members] => Array(
      [0] => http://g3.com/rest/item/2
      [1] => http://g3.com/rest/item/3
      [2] => http://g3.com/rest/item/4
      [3] => http://g3.com/rest/item/5
      ...
    )
    [relationships] => Array(
      [tags] => Array (
      [0] => http://g3.com/rest/tag_item/2,1
      [1] => http://g3.com/rest/tag_item/23,1
      )
    )
  )
2010-01-22 00:27:00 -08:00
Andy Staudacher 07ba5fe43a Use Unicode instead of HTML entity (since the l10n server normalizes this way and rejects submissions that change under the normalization step) 2010-01-21 23:53:21 -08:00
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 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 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 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
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 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 feefdfd533 Stop using MY_ORM::original(). 2010-01-20 22:51:18 -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 210e02f000 Throw Rest exceptions, not regular exceptions. 2010-01-20 21:13:58 -08:00
Bharat Mediratta b5cf24456f Forbidden is a 403, not a 503. 2010-01-20 00:51:34 -08:00