summaryrefslogtreecommitdiff
path: root/modules/gallery/models
AgeCommit message (Collapse)Author
2009-10-24When an item is renamed or move insure that the target file name doesn't ↵Tim Almdal
exist. fixes ticket #694
2009-10-22Change the name of identity library from Identity to IdentityProvider. ↵Tim Almdal
Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class
2009-10-16Start simplifying the interface by moving the static methods from user.php ↵Tim Almdal
and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module.
2009-10-09Convert direct lookups for the user table using ORM to using the ↵Tim Almdal
user::lookup_by_name and user_lookup API methods. Convert the Admin_User controller Convert the login and password change controller Change the item model to call user::lookup to get the owner. On the log model, delete the relationship between the log and user table, and replace with a call to user::lookup (cherry picked from commit 194cc3b27a73afe5119da9f09407c1e068dc6fa3) Create the get_user_list, lookup_by_name, lookup_by_hash and get_group_list api functions
2009-10-11Make the slug field required for all items.Bharat Mediratta
Make the filename field required for photos/movies. Fixes ticket #838
2009-10-08Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_devTim Almdal
2009-10-05First pass on converting calls to the Identity interface. Will worry about ↵Tim Almdal
writes and saves later. Convert the Admin_User controller Convert the login and password change controller Change the item model to call user::lookup to get the owner. On the log model, delete the relationship between the log and user table, and replace with a call to user::lookup
2009-10-04Renamed most, if not all css selectors from gName to g-name. Moved a few ↵Chad Kieffer
shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.
2009-09-21Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_devBharat Mediratta
Conflicts: modules/gallery/controllers/albums.php
2009-09-212nd attempt at gracefully dealing with sort columns that containBharat Mediratta
nulls. This time around, do a query to determine whether or not the sort column has nulls in it. If it doesn't, then use our comparators as before. There are NULLs in the sort column, so we can't use MySQL comparators. Fall back to iterating over every child row to get to the current one. This can be wildly inefficient for really large albums, but it should be a rare case that the user is sorting an album with null values in the sort column. Fixes #627
2009-09-21Fix Item_Model::get_position() so that our sort is stable when the comparisonBharat Mediratta
row has a null value in the sort field. Fix for #627 Note: this changes get_position() to take an Item_Model instead of an id!
2009-09-11rawurlencode() path components in relative_path_cache andBharat Mediratta
relative_url_cache so that they're safe for browser use.
2009-09-08Change the relative_path_cache and relative_url_cache columns to storeBharat Mediratta
urlencoded data for ease of use when we're dealing with the data. This fixes ticket #569 by not allowing the urls that we put into our RSS feeds to have bad characters in them. We have to convert a path like var/albums/foo/"quotes"/bar.jpg into something like var/albums/foo/%22quotes%22/bar.jpg. If we take the approach of storing native data in the cache, then we have to explode the path, urlencode the bits, and implode it again to avoid escaping the / char. By storing it escaped, we avoid this problem. I believe (but have not tested) that this is more efficient.
2009-09-08Minor tweaks to the url refactor.Bharat Mediratta
2009-09-08Move specialized (pretty) url generation back into Item_Model so thatBharat Mediratta
we're not relying on overriding url::site() to do tricks around item urls. This means that you won't get item urls by doing url::site("albums/37"), for example, but it also means that we won't get pretty urls where we don't expect them (like in the action of a <form> element). Incidentally, this will help us move over to using the slug format because if you've got a bad character in a url, the edit forms will now work on it since they'll be id based.
2009-09-07Update Item_Model::save() to consider the relative_xxx_cache fields asBharat Mediratta
insignificant, in addition to the view_count field. This means that we won't trigger an event, nor will we adjust the updated field if *only* those fields are changed.
2009-09-071. Actually set the slug to the new value in the controllers.Bharat Mediratta
2. Fix up an issue where we were crashing if there were no conflicting rows 3. Amend Item_Model so that if you change the slug, it flushes the cache for all children
2009-09-07Correct a mental mistake in the prior change. All the xxx_url()Bharat Mediratta
methods actually refer to the url to the file on disk, not the logical item. That's relative_url(). Perhaps some API renaming is in order?
2009-09-07Add support for a per-item "slug" which will be the user-visible urlBharat Mediratta
component for that given item. Album hierarchies are represented by nested slugs. By default, we convert the filename to a slug when you create an album, photo or movie.
2009-09-02Refactor how we use $this->relative_path() so that we're not callingBharat Mediratta
it twice on both sides of a ternary operator.
2009-08-29Fix for 641... extend viewable functionality to comments. Viewable unit test ↵Tim Almdal
is not working.
2009-08-18Refactor the get maximum weight functionality into a method in the item ↵Tim Almdal
helper, so that we can use it else where (i.e. the new organize module) Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-05Change the children and descendants APIs to be more consistent and toBharat Mediratta
remove Gallery3 concepts from ORM_MPTT. The following API methods: ORM_MPTT::children ORM_MPTT::children_count ORM_MPTT::descendants ORM_MPTT::descendants_count All now take a $where clause that allow you to pass through additional field parameters. old API: $album->children(10, 0, "photos") $album->children_count("photos") new API: $album->children(10, 0, array("type" => "photos")) $album->children_count(array("type" => "photos")) This gives us a more flexible API and simplifies the code. While I was in there, I changed the way we deal with default orderby values so that we just assign the default value in the function definition, which allows us to get rid of all conditionals in the implementation which results in simpler code.
2009-08-05Change the children methods on Item_Core and ORM_MPTT in order toTim Almdal
specify a type parameter, so tht we can filter the children based on type (i.e. album, photo, etc). In addition, expose the sort order, so that we can specify the order we want to return the children.
2009-08-02Change the API for getting to the original state of an ORM.Bharat Mediratta
Old API: $obj->original("field_name") New API: $obj->original()->field_name This allows us to revert the varous xxx_updated events back to passing an original ORM as well as the the updated one. This makes for a cleaner event API. Old API: comment_updated($comment) { $comment->original("field_name") } Old API: comment_updated($old, $new) { $old->field_name }
2009-07-30Add some code to guard the weight calculation against zero rows whenBharat Mediratta
we're doing an initial install.
2009-07-29Oops, I removed too much in my last change. Put talmdal's query back,Bharat Mediratta
but change it to use Database instead of ORM for a little more efficiency.
2009-07-29Remove some scary debug code.Bharat Mediratta
2009-07-30Fix for ticket #576Tim Almdal
Add a weight index to the item table and changed the retrieval of the maximum weight to select weight from items order by weight desc limit 1. Upgrades the gallery module to version 10 Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-27Remove the unnecessary ORDER BY on $this->sort_column inBharat Mediratta
get_position(), and instead apply an ORDER BY on `id` in the 2nd query so that we have stability among the equal elements. This should result in cheaper (and more sensible) queries.
2009-07-27Merge branch 'master' of git@github.com:gallery/gallery3Andy Staudacher
2009-07-27Revert "Remove an useless ORDER BY."... the order by wasn't all that useless.Andy Staudacher
This reverts commit c80d2da0a95a63b76f5a4c835f1a0e1022ec2f53. Conflicts: modules/gallery/models/item.php
2009-07-27Revert "Fix for ticket #452"Tim Almdal
This reverts commit 809e52d80cbf3beb75b238fddb0da3951fb9a8e7.
2009-07-26Merge branch 'master' of git://github.com/rledisez/gallery3 into rledisez/masterAndy Staudacher
2009-07-25Fix for ticket #452Tim Almdal
1) Change access_Core::user_can to return true for all permissions if the owner is the specified user. 2) Change Item_Model::viewable to set the owner_id is the first view_restriction This allowed simplification of the generating the where clause to a single $this->orwhere instead of a where and an orwhere.
2009-07-25Rename columns that use reserved SQL words : items.left and items.rightRomain LE DISEZ
2009-07-20Merge commit 'upstream/master'Romain LE DISEZ
2009-07-19Don't post the item_updated() event if we're just updating the view count.Bharat Mediratta
2009-07-18Merge commit 'upstream/master'Romain LE DISEZ
2009-07-17Change model_cache::clear() API to clear everything. This preventsBharat Mediratta
old ORM relationships from hanging around, which was causing problems when doing MPTT manipulations (resulting in incorrect permission propagation-- very bad!)
2009-07-17Fix a bug where moved items don't properly inherit permissions fromBharat Mediratta
their new target. After each move, recalculate the permissions for the new parent's hierarchy. Fixes ticket #552
2009-07-16Second non-trivial change to the event code. We now publish modelBharat Mediratta
related events from within the model handling code. The only exception to this currently is item_created which is challenging because we have to save the item using ORM_MPTT::add_to_parent() before the object itself is fully set up. When we get that down to one call to save() we can publish that event from within the model also.
2009-07-16Non-trivial changes to the event handling code:Bharat Mediratta
1) The item_updated event no longer takes the old and new items. Instead we overload ORM to track the original data and make that available via the item. This will allow us to move event publishing down into the API methods which in turn will give us more stability since we won't require each controller to remember to do it. 2) ORM class now tracks the original values. It doesn't track the original relationships (no need for that, yet) 3) Added new events: item_deleted group_deleted user_deleted
2009-07-16Merge commit 'upstream/master'Romain LE DISEZ
2009-07-07Added a wee bit of phpDoc.Tim Almdal
Changed the name of the method get_task_log to get_log Changed the default name of the file when the log is downloaded to gallery3_task_log.txt
2009-07-07Allow the task::log method to take an array of lines and change g2_import.phpTim Almdal
helper to use this approach.
2009-07-06Cleanup remove task processing. Change Task_Model::delete to call parent::deleteTim Almdal
instead of parent::save. :-) Also change admin_maintenance_controller to delete via looping over all of the completed tasks and delete individually, so we can delete the associated cache entries at the same time.
2009-07-05Add task logging functionality. When a task runs, it creates a log that isTim Almdal
stored in the persistant cache for 30 days. On the admin_maintenance page there is a new link for completed tasks "browse log". Clicking this will open a dialog box that has the the contents of the log displayed. The user can then view the log and close the dialog, or press the save button to download the log to their local machine.
2009-06-30Fix for #319.Tim Almdal
Created a new view "movieplayer.html.php", which is rendered by Item_Model::movie_img(). Changed movie.html.php to use movie_img to render the movie player link.
2009-06-27Implemented a Database driver for the Kohana Cache library. Rather then ↵Tim Almdal
writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm.