Commit Graph
195 Commits
Author SHA1 Message Date
Bharat Mediratta 7aac471b82 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts:
	modules/gallery/js/quick.js
2009-08-08 20:56:06 -07:00
Bharat Mediratta c9f5000e65 Improve the graphics toolkit detection code so that properly
identifies situations where its restricted by open_basedir.

We now track more informatoin about the toolkit including the version
and any errors we encountered while doing the detection so that we can
provide more info downstream.  This makes graphics::detect_toolkits()
a little heavier, but that's ok because it should not be called very
often.

In the process, refactor the controller and view hierarchy so that
it's a little more straightforward in the code.

Fixes ticket #616.
2009-08-08 20:31:16 -07:00
Chad Kieffer ed6302a0ad Merge branch 'master' of git@github.com:bharat/gallery3 2009-08-08 01:14:51 -06:00
Chad Kieffer 6357f3332b Added basic context menu affects and styles. Simplified some of the action labels in the menu. 2009-08-08 01:14:22 -06:00
Bharat Mediratta c09e2ef7af Merge branch 'master' of git@github.com:bharat/gallery3 into bharat_branch 2009-08-06 12:44:39 -07:00
Tim Almdal b826182b7a Cleanup the javascript for enabling dialog or panel links.
1) We don't need to loop over the elements to bind the event handler.
2) Just include gallery.panel.js for all the admin pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-06 22:28:05 +08:00
Bharat Mediratta e8c57290a2 Change the children and descendants APIs to be more consistent and to
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-05 10:38:53 -07:00
Tim Almdal 81d39a9bb1 Remove the trigger definition code 2009-08-05 07:47:17 -07:00
Tim Almdal 2f63a5379f Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-05 06:51:27 -07:00
Chad Kieffer 58dbee03e5 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-04 23:38:11 -06:00
Bharat Mediratta a03b9273b2 Dump any exceptions into the standard Kohana log as well as the task
log for maximum exposure.
2009-08-04 20:34:46 -07:00
Bharat Mediratta 52147cf6f8 Combine the quick menu and the thumb menu into a single menu called
the "context" menu.

This new context menu is generated using the typical event processing
system, like our other menus.  The specialized quick CSS and JS is now
gone, replaced by our generic menu handling code.  It's all rolled
together currently using the thumb_menu UI for easy packaging.  All
the CSS and JS is updated.

NOTE: the non-dialog links (rotate, album_cover) have a broken UI
because they return JSON which the quick.js code handled specially,
but we don't handle properly now.  I need to fix this.
2009-08-03 21:45:54 -07:00
Tim Almdal bb8c83db81 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-31 14:51:37 -07:00
Bharat Mediratta f034c6c534 Add new events:
graphics_resize
  graphics_resize_completed
  graphics_rotate
  graphics_rotate_completed
  graphics_composite
  graphics_composite_completed
2009-07-31 13:32:07 -07:00
Tim Almdal 7aa03e59ba Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-30 19:25:43 -07:00
Bharat Mediratta 0f43b35747 Fix a static function declaration. 2009-07-30 09:54:59 -07:00
Tim Almdal 29f5a231c7 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/gallery/models/item.php
2009-07-30 05:15:24 -07:00
Bharat Mediratta 15f148349e Make body_attributes() a theme callback instead of a method on the
View.  This allows modules to piggyback on it.
2009-07-29 17:25:53 -07:00
Tim Almdal 6f1da3aba4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-29 16:47:16 -07:00
Bharat Mediratta 5d0413631f Bump the gallery version to 10 in install() 2009-07-29 16:44:51 -07:00
Bharat Mediratta 7438a9c889 Remove some scary debug code. 2009-07-29 16:40:01 -07:00
Tim Almdal ead6a61d9e Fix for ticket #576
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-30 01:59:07 +08:00
Tim Almdal 653c291d94 Fix for ticket #576
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
2009-07-29 10:55:56 -07:00
Bharat Mediratta 544e92adc9 Move site_menu and admin_menu into gallery helper so that site_menu
can call admin_menu.
2009-07-28 20:32:11 -07:00
Bharat Mediratta 44bc74edb9 Change search callbacks to use the event system, so move them out of
xxx_search helpers and into xxx_event helpers.
2009-07-28 20:30:34 -07:00
Bharat Mediratta 1e90e40d3a Use events to generate menus, instead of having xxx_menu helpers.
This is the first step towards having a simple, lightweight and
unified API for module interaction.
2009-07-28 13:47:22 -07:00
Tim Almdal f5c4d23e57 Convert the album add dialog to use the new Form_Script library
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 21:39:05 +08:00
Tim Almdal a7f4d7aced Revert commit 078c77a62b and change the
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 21:00:25 +08:00
Tim Almdal 4edf86f0eb Revert "Fix for ticket #452"
This reverts commit 809e52d80c.
2009-07-27 11:14:03 -07:00
Tim Almdal 5fd82a2ede Back out the fix for ticket #452
Revert "Changed access::user_can to force the owner of an item to have"

This reverts commit 0b97cfd6f0.
2009-07-27 11:13:20 -07:00
Tim Almdal 1ec1f19f1a Back out fixes for ticket #452
Revert "It helps to save before committing :-)"

This reverts commit 0d76d6fd77.
2009-07-27 11:12:27 -07:00
Andy Staudacher 570e0b0267 Merge branch 'master' of git://github.com/rledisez/gallery3 into rledisez/master 2009-07-26 22:45:53 -07:00
Tim Almdal 0d76d6fd77 It helps to save before committing :-) 2009-07-26 09:33:44 -07:00
Tim Almdal 0b97cfd6f0 Changed access::user_can to force the owner of an item to have
view permission on the parent. Added a whitelist of allowable
owner permissions.

If the requested permission is view and the user requesting access
is the owner, check that they have view permission to the parent.
2009-07-26 09:29:29 -07:00
Tim Almdal 809e52d80c Fix for ticket #452
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-25 23:45:48 -07:00
Tim Almdal f8516b55d2 Fix for ticket #594. Forced the directory name to be required when editting the album. 2009-07-25 15:18:41 -07:00
Romain LE DISEZ 23bb6eb7e3 Rename columns that use reserved SQL words : items.left and items.right 2009-07-25 19:06:54 +02:00
Bharat Mediratta 50d6cc0150 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-23 22:08:29 -07:00
Tim Almdal 078c77a62b Add tag autocomplete to the album and photo edit pop up dialogs.
This required putting a wrapper view around the forms and passing
this view as the parameter to the item_edit_form event.  The view
contains a $script variable that the modules can add script to be
included in the form html when rendered as part of the ajax response.
2009-07-24 14:18:15 -07:00
Bharat Mediratta 01aea268e6 Disable the album cover icon if the item is already the current album cover. 2009-07-23 17:15:53 -07:00
Bharat Mediratta 7f1a7ead58 Fix a typo in a comment 2009-07-23 09:24:33 -07:00
Romain LE DISEZ 216a21ba8a Upgrade code to migrate the ACL from integer to boolean.
Related to 719c59e040
(cherry picked from commit 831bf63c23)
2009-07-23 09:12:15 -07:00
Romain LE DISEZ 7c7d4c0ec0 Consistency : always use self::XXX
(cherry picked from commit c9017ae2f2)
2009-07-23 09:12:08 -07:00
Romain LE DISEZ 350c1b0267 Use BOOLEAN instead of integer to describe the permissions :
- DENY = false
 - ALLOW = true
 - UNKNOW = null  (for intent only)
 - INHERIT = null (for cache)

Upgrade is not included for now.
(cherry picked from commit 719c59e040)
2009-07-23 09:11:55 -07:00
Tim Almdal 85ed445e23 remove an extra ->reload() that was there for testing 2009-07-22 15:20:30 -07:00
Tim Almdal d4104a23ec Add explicit unit tests for access::user_can 2009-07-22 15:16:56 -07:00
Bharat Mediratta dbeadc1407 Use the Kohana cascading filesystem to locate resources loaded by the
theme.  Because the theme comes first, this means that themes can
override any module resources, at the cost that we no longer have
namespacing for JS and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
2009-07-22 14:27:57 -07:00
Bharat Mediratta 4854003f41 bump version to "3.0 git (pre-beta3)" 2009-07-22 13:03:01 -07:00
Tim Almdal 4ddaaeb9dd Duh... when I added user_can, I passed in the user, but still used the groups from the session 2009-07-22 09:39:22 -07:00
Tim Almdal f533aee1cc Add an API method user_can that allows for checking a specific user has the
specified permission to the item.  Changed can to delegate to this method
passing in the active user.
2009-07-21 15:52:46 -07:00