summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
AgeCommit message (Collapse)Author
2010-08-22Get rid of the move dialog and move option. Instead, replace it withBharat Mediratta
a call to Organize with the appropriate album open. I have not yet figured out how to get the SWF code to highlight the active image, but that's coming. Partial fix for #1204.
2010-08-21Tighten up whitespace.Bharat Mediratta
2010-08-17use HTTP_HOST instead of SERVER_NAME so that we're sending requestsBharat Mediratta
back to the same canonical domain that we came from. Else Flash makes crossdomain.xml requests, fails, and falls over. Fixes ticket #1298.
2010-07-31Full pass over all the JSON encoding and JS dialog code. We now abideBharat Mediratta
by the following rules: 1) An initial dialog or panel load can take either HTML or JSON, but the mime type must accurately reflect its payload. 2) dialog form submits can handle a pure HTML response, but the mime type must also be correct. This properly resolves the problem where the reauth code gets a JSON response first from the reauth code, and then an HTML response when you reauth and continue on to a given form -- try it out with Admin > Settings > Advanced. 3) All JSON replies must set the mime type correctly. The json::reply convenience function does this for us. 4) By default, any HTML content sent back in the JSON response should be in the "html" field, no longer the "form" field. The combination of these allows us to stop doing boilerplate code like this in our controllers: // Print our view, JSON encoded json::reply(array("form" => (string) $view)); instead, controllers can just return HTML, eg: // Print our view print $view; That's much more intuitive for developers.
2010-07-31More patches as part of #1225. Change the 'core' modules to use the json::replyTim Almdal
method to set the content type header and encode the response as a json object
2010-07-11Merge branch 'master' into talmdal_devTim Almdal
2010-07-10Accept extension .m4v as video/mp4Romain LE DISEZ
2010-07-06Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the ↵Tim Almdal
dialog. Convert all the controllers that create the data to go into a dialog to return the html as part of a json object.
2010-06-18Simplify rest::get_access_key($user) to rest::access_key() thatBharat Mediratta
returns just the access key string for the active user. That's how we use the API, so keep it simple.
2010-06-181) Change how the size of the flexstage is calculated. (Basically remove theTim Almdal
dialogWidth and dialogHeight and adjsut the internal controls when added to the stage. 2) Cleanup the controller code
2010-06-18Use request::protocol().Bharat Mediratta
2010-06-17Rearrange the adding of fields to the template so that they match the order ↵Tim Almdal
of appearance in the template. Also remove the @todo's
2010-06-17Add a cache-buster to the SWF url so that it'll refresh in the browserBharat Mediratta
every time the SWF file changes.
2010-06-14Change the parameters for the organize dialog box. The baseUrl parameter was ↵Tim Almdal
removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box.
2010-06-13Remove a debugging statement.Tim Almdal
2010-06-13Fix problems ith IE and flex initialization when one of the flashvars ↵Tim Almdal
contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome
2010-05-20Add items and add albums are now working. What still needs to be done is ↵Tim Almdal
add a progress bar for longer running tasks
2010-05-18checkpoint the new organize module. At this point rearrange and move work. ↵Tim Almdal
Rearrange is moving items within the same album, move is moving to a different album.
2010-03-30add a controller method to return the translated labels for the add album ↵Tim Almdal
dialog.
2010-03-27Convert the old organize to the new flex based organizeTim Almdal
2010-03-03Update the copyright to 2010. It's only 3 months into the year :-)Bharat Mediratta
2010-02-15Input sanitizationAndy Staudacher
2010-02-07The adjustment for before or after based on whether the locales rtl or not ↵Tim Almdal
is now done in the browser.
2010-02-04If the locale is rtl then change 'after' to 'before' or vice-versa. Fixes ↵Tim Almdal
ticket #939.
2010-02-04Don't change the current album when items are dragged to a different album ↵Tim Almdal
in the album tree. Fixes ticket #959.
2010-01-27Convert __toString() to use (string) cast instead.Bharat Mediratta
2009-12-25Convert some database callsBharat Mediratta
2009-12-21Updates for the latest version of Kohana 2.4:Bharat Mediratta
1) Controller::$input is gone -- use Input::instance() now 2) Handle new 'database.<default>.connection.params' parameter 3) Handle new 'cache.<default>.prefix' parameter
2009-09-15Controller auth / CSRF fixesAndy Staudacher
2009-09-14Change the variable to to resolve ticket #769Tim Almdal
2009-09-10Rename ORM_MPTT::is_descendant() to ORM_MPTT::contains() to make theBharat Mediratta
API a little clearer. Write a test for it, too.
2009-09-10Rename $album to $target in move_to()Bharat Mediratta
2009-09-10A better fix for #741... the original problem was that the source and album ↵Tim Almdal
variables were reversed
2009-09-10Changed the check in organize_Controller::move_to:Tim Almdal
1) check that target and source are not the same. 2) check that the source is not already a child of the target (use to be a descendant) Fixes #741.
2009-08-30Don't try to move an item into its own descendant hierarchy. Just leave it ↵Bharat Mediratta
out of the move for now.
2009-08-30Manage the selection so we don't automatically select an albumBharat Mediratta
whenever we expand a tree.
2009-08-30Precalculate the organize tree based on the selected album and renderBharat Mediratta
it right away while still allowing incremental tree loading.
2009-08-29Change the organize tree to expand/collapse. It doesn't properly openBharat Mediratta
up to the album that you're viewing, and if you move a photo to a different album it'll reload the entire album tree.
2009-08-29Fix a bug where organize doesn't properly generate the tree at the root album.Bharat Mediratta
2009-08-29Get rid of the task infrastructure. The multiple requests greatlyBharat Mediratta
slow down simple operations. We may run into problems with more complex operations, but let's only add tasks into the mix when it's clear that we need them.
2009-08-29Major refactor of organize:Bharat Mediratta
* Clean up naming conventions for variables in the controller so that we specifically refer to albums with $album_id, etc. * Move complexity for drawing tree out of the controller and into the view. * Simplify task definitions to get rid of extraneous text * Change __PLACEHOLDERS__ to clearly define which is the album and which is the item that we're moving before/after * Remove as many CSS ids as we can from the tree view to keep things simple
2009-08-28Display the sort order in the Organize dialog, and allow users toBharat Mediratta
change the sort order on the fly.
2009-08-28Fix a couple of off-by-one errors.Bharat Mediratta
2009-08-28Refactor rearrange_task_handler to have a more linear flow.Bharat Mediratta
2009-08-28Clean up in preparation for some refactoring.Bharat Mediratta
2009-08-17This patch adds some security to the organize dialog.Tim Almdal
1) If images are dragged from the content pane and dropped on a branch in the tree that the user only has view priviledges, then the drop is cancelled and the images are reverted. 2) The user cannot click on a branch, to which they only have view priviledges, the content pane does not change to the new album
2009-08-17remove the batch start/stop and replace the ORM update of the weight, with a ↵Tim Almdal
direct sql update. This bypasses the gallery3 event mechanism. Fire a album_rearrange event when the rearrangement is complete
2009-08-17Change back to using the ORM to update the child weight, but use the ↵Tim Almdal
batch::start() method so notifications are queued
2009-08-17Fix the performance problem related to setting the child weight, by ↵Tim Almdal
bypassing ORM and generating the sql directly.
2009-08-17The rearrange functionality works. but it is slower than shit. I've left ↵Tim Almdal
the debug statements in until we can solve this issue.