summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
AgeCommit message (Collapse)Author
2010-07-05If the admin request originates as a dialog link, don't display the entire ↵Tim Almdal
page when reauthenticating the administrator. Just put the form in the dialog.
2010-07-04In the site menu, say "Delete album", "Delete photo" or "Delete movie"Bharat Mediratta
as appropriate for the item type. Fixes ticket #1175.
2010-07-03When we delete an item, make sure that we scrub it from any otherBharat Mediratta
items that may have it in the album_cover_item_id column. Fixes ticket #1172.
2010-06-26Sentence casing.Bharat Mediratta
2010-06-26Differentiate in our logs between missing site and admin theme overrides.Bharat Mediratta
2010-06-25Better fix for the problem that a preview of an admin theme was not showing up.Tim Almdal
2010-06-25Fix an issue where a preview of the admin view would not work.Tim Almdal
2010-06-25Change the theme option page to display using tabs if the site theme has an ↵Tim Almdal
admin page.
2010-06-20Rename "simple_uploader" to "flash_uploader" to make room for an HTMLBharat Mediratta
uploader.
2010-06-20Rename "children" to "items" in our feed view because it makes moreBharat Mediratta
semantic sense.
2010-06-20Add a loading indicator to the delete form by tagging some JS on atBharat Mediratta
the end which triggers .gallery_show_loading(). Not a complete fix for #817 but it's a start and it takes care of one place where we have a long running process.
2010-06-19Rework our exception framework to fit into Kohana's model better.Bharat Mediratta
Instead of overwriting Kohana_Exception::handle() (which we were doing in MY_Kohana_Exception) we instead use their existing template system. gallery/views/kohana/error.php overrides system/views/kohana/error.php and is the standard error template for all exceptions. Our version of error.php figures out the appropriate view based on context (cli, authenticated admin, guest viewing a 404, guest viewing a system error) and delegates appropriately. Each delegated view has a narrow responsibility. This paves the way for us to add new error views per module. For example, the rest module will define its own template in Rest_Exception and then its exceptions can be rendered the way that it wants (json encoded, in that case).
2010-06-18Use request::protocol()Bharat Mediratta
2010-06-16Fix issue1068. Fill from_id field in photo with indetificatorJan Koprowski
2010-06-15Revert "Change the item rest update processing to call theBharat Mediratta
item::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move." Rolling this back for a couple of reasons: 1) Bug in move.php ("message.info" is not a function name) 2) Having the message come back from the API call as a side-effect is sloppy. We should find a cleaner way to do this checking. 3) having item::move() call save() on any changed values in the ORM is counter-intuitive. Move should move, save should save. I think the right approach here is to roll the move() code properly into save(). This reverts commit 2492280cc0ec9eb64a8daeccc7b5698ece7fea66.
2010-06-15Revert "Fix for ticket #1118. Create a item::save_with_retries helperBharat Mediratta
method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly." Rolled this back because it fails KISS. We already have an API for saving models with Item_Model::save() that's consistent with all of our other model code. Adding a new way to save items is confusing and inconsistent. This reverts commit 9504f71efcadc7ed27f6f09e5d663e8025bf3b86.
2010-06-15Fix for ticket #1118. Create a item::save_with_retries helper method, which ↵Tim Almdal
encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly.
2010-06-15Change the item rest update processing to call the item::move(source, ↵Tim Almdal
target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move.
2010-06-15Only change the weights of the album children if the item sort_column is set ↵Tim Almdal
to weight.
2010-06-15Revert "Change the item rest update processing to call the ↵Tim Almdal
itemm::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight." This reverts commit 603d4640141a43350f50da747d747456b28fdd93.
2010-06-15Change the item rest update processing to call the itemm::move(source, ↵Tim Almdal
target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight.
2010-06-14Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2010-06-13Replace __CSRF__ with the actual csrf token.Bharat Mediratta
2010-06-13Change single to double quotes.Bharat Mediratta
2010-06-13Merge branch 'master' into talmdal_devTim Almdal
2010-06-12Make login/logout continuation url code consistent. Where necessary,Bharat Mediratta
we specify the continue_url in the session, but we store it in the login form so that we can propagate it across the session creation that happens at login time.
2010-06-12Use "continue_url" instead of "continue" for consistency with theBharat Mediratta
reauth code.
2010-06-12Stop trying to parse the continue url in the logout controller becauseBharat Mediratta
it requires us to reproduce a bunch of complex routing logic. Instead, just have the logout link generating code generate a link that's visible to guests.
2010-06-10Change the pattern used to convert the file name to a title. Fixes ticket#1061Tim Almdal
2010-06-09Revert the "preserve_ids" global query parameter. We decided that it was aBharat Mediratta
bad idea. This reverts commit 6425d41eddd44091b2d83ba3c3734cc6990ca581.
2010-06-08Don't use the standard error formatting for exceptions that have occurred as ↵Tim Almdal
part of a REST request. Format the exception as a json encoded text string so the client can extract the fault information if they so choose.
2010-06-07Add a "preserve_ids" global query parameter for REST requests thatBharat Mediratta
indicates that we shouldn't opportunistically convert ids into REST urls.
2010-06-07Merge branch 'master' into talmdal_devTim Almdal
2010-06-06Don't show the rotate links if the active user can't edit the photo. Fixes ↵Bharat Mediratta
ticket #1157. Thanks to psvo.
2010-06-06Try to adjust for situations where /proc/loadavg is_readable() butBharat Mediratta
generates an error if we call file() on it. Fixes ticket #1149.
2010-06-06Merge branch 'master' into talmdal_devTim Almdal
2010-06-06Fix an unused variable caused by converting straight query paramsBharat Mediratta
to $entity based params.
2010-06-06Change "ancestor_for" to "ancestors_for" for consistency.Bharat Mediratta
2010-06-05item::random_query() doesn't need to take a "where" clause becauseBharat Mediratta
it's returning a query, so the caller can add the where clause himself. This makes for a cleaner API.
2010-06-05Undo the change added in e4eedbce2298535540cb651d75ba6f1bf42cf02bBharat Mediratta
which deactivates modules on upgrade. No idea why we did that, but it breaks upgrading because it deactivates any module that's been upgraded.
2010-06-05Fix a comment typo.Bharat Mediratta
2010-06-04Change the name of the private format_restful_item to _format_restful_item ↵Tim Almdal
so that the File_Structure_Test will pass.
2010-06-04Save the item before updating the order of the children. Also always ↵Tim Almdal
increment the weight count (even if it is equal to the weight of the current child)
2010-06-04Allow the use of the type query parameter to filter the results of a ↵Tim Almdal
rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e)
2010-06-04Remove the item id from the rest/gallery/items url as that was inconsistent. ↵Tim Almdal
Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php
2010-05-28If the file is empty (i.e. the upload failed, then throw a 'bad request' ↵Tim Almdal
exception before trying to create the item.
2010-05-18Save the item before updating the order of the children. Also always ↵Tim Almdal
increment the weight count (even if it is equal to the weight of the current child)
2010-05-15Allow the use of the type query parameter to filter the results of a ↵Tim Almdal
rest/gallery/items?urls=... request. This allows the client to pass the entire list of member urls and have the rest server filter the results based on the specified types. (cherry picked from commit 3fe10b15cf9359b66452c24965df575203e8af8e)
2010-05-15Remove the item id from the rest/gallery/items url as that was inconsistent. ↵Tim Almdal
Add the query parameter ancestors_for=<url> to provide a restful way to retrieve the ancestors of an item. (cherry picked from commit e9c8a8ae532e785ab95e6b43864c93b485785d6c) Conflicts: modules/gallery/helpers/items_rest.php
2010-05-14Fix-ups for d98b85f7d3142676e6b4f407a18ed81564823f88Bharat Mediratta
- Pass the CSS selector of the active image in as an arg to site_menu so that quick operations know what they're operating on. - Change the ids from g-{photo,movie}-id to the generic g-item-id - Initialize ajax handlers for site menu on the photo and movie page - Drop the movie context menu, it's now in the site menu