summaryrefslogtreecommitdiff
path: root/modules/gallery
AgeCommit message (Collapse)Author
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-15Make the "name" column a little wider.Bharat Mediratta
2010-06-15Install the rest module by default.Bharat Mediratta
2010-06-15Sort files by path in _dump_var() for consistent output.Bharat Mediratta
Skip . and .. (PHP 5.3 iterators seem to include those now).
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-15Add a simple/cheap test to make sure that the database config is ok. Fixes ↵Bharat Mediratta
ticket #1029.
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-12Fix up some indentation and comment style.Bharat Mediratta
2010-06-12Bounce the user to the login page if they try to get to part of theBharat Mediratta
admin site as a guest. Also, theme the login/html page.
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-12Push the continue url into the form for consistency with otherBharat Mediratta
login/continue 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-12Revert "Fix for ticket #1118. The item validation was flagging duplicate ↵Bharat Mediratta
slugs as errors. There was already code in the item save to insure that any" This introduces a bug where you can create two items with the same slug. This reverts commit cb01f4017d70a7d73273052b424e8b78b794bc1c.
2010-06-11Fix for ticket #1118. The item validation was flagging duplicate slugs as ↵Tim Almdal
errors. There was already code in the item save to insure that any duplicates were made unique, so this patch removes the validation as unnecessary.
2010-06-11Fix for ticket #1039. The problem was, as Bryan76 pointed out, with passing ↵Tim Almdal
the full url in the continue parameter. In the logout controller, we tried to get the item from the url so we could check the permission of the item to insure that the guest user had access. But url::get_item_from_url expects a relative url.
2010-06-11Actually execute the database query that updates the album view count. Fixes ↵Tim Almdal
ticket #1092. Thanks to shinta for pointing the way.
2010-06-11Actually execute the database query that updates the album view count. Fixes ↵Tim Almdal
ticket #1092. Thanks to shinta for pointing the way.
2010-06-10Change the pattern used to convert the file name to a title. Fixes ticket#1061Tim Almdal
2010-06-10Merge branch 'master' into talmdal_devTim Almdal
2010-06-09Update golden fileBharat Mediratta
2010-06-09In GalleryCodeFilterIterator::accept(), ignore . and .., and stop caring ↵Bharat Mediratta
about .svn
2010-06-09Fix get_ancestor_test() since the parameter was renamed to ancestors_for.Bharat Mediratta
2010-06-09Revert the "preserve_ids" global query parameter. We decided that it was aBharat Mediratta
bad idea. This reverts commit 6425d41eddd44091b2d83ba3c3734cc6990ca581.
2010-06-08Add a "can_edit" field to the Item_Model's REST output. It'sBharat Mediratta
applicable to the current user.
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-07Add a "convert_ids" parameter to Item_Model::as_restful_array(), whichBharat Mediratta
we can turn on with a query parameter.
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-04Correct XSS Security Test golden file for recent changes. Update the ↵Tim Almdal
controller_auth data file for the rename of admin_comments to admin_manage_comments.
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.