Commit Graph

401 Commits

Author SHA1 Message Date
Bharat Mediratta
eda2d75fa0 Disable smooth progressbar scrolling when we're at 100% (else the
progressbar trucks along slowly even though the task is done).
2009-07-28 20:31:24 -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
2f969c80eb Create A Forge Script element. Form_Script allows the specification
of either a url to a script file or in line text which will be included
in a script block.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 12:04:23 +08:00
Bharat Mediratta
7efb4b4cdf Remove the unnecessary ORDER BY on $this->sort_column in
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-27 15:17:14 -07:00
Bharat Mediratta
b3fe70e654 Updated. 2009-07-27 11:34:27 -07:00
Andy Staudacher
e68599f6d7 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-27 11:27:50 -07:00
Andy Staudacher
d18f31ab21 Revert "Remove an useless ORDER BY."... the order by wasn't all that useless.
This reverts commit c80d2da0a9.

Conflicts:

	modules/gallery/models/item.php
2009-07-27 11:25:23 -07: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
Romain LE DISEZ
0aa3ec3ae9 Merge commit 'upstream/master' 2009-07-25 13:59:04 +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
Tim Almdal
fa1d32e646 Partial implementation of ticket #80. Provide auto complete and suggestions on the tag add form in the tag sidebar block. Updated the xss golden file as well. Still to do figure out how toget it into the edit popup dialog 2009-07-24 11:24:43 -07:00
Bharat Mediratta
5c8a2a750c Smooth out the animaation for the progress bar. 2009-07-23 20:43:32 -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
0e9b80d2ef Updated golden file 2009-07-23 16:20:40 -07:00
Romain LE DISEZ
b181707c16 Merge commit 'upstream/master'
Conflicts:

	modules/gallery/helpers/access.php
2009-07-23 19:44:40 +02: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
Romain LE DISEZ
386130114b Merge commit 'upstream/master' 2009-07-23 18:08:57 +02: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
Romain LE DISEZ
06fd89e8bc Merge commit 'upstream/master' 2009-07-22 19:04:16 +02: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
Romain LE DISEZ
831bf63c23 Upgrade code to migrate the ACL from integer to boolean.
Related to 719c59e040
2009-07-22 15:40:49 +02:00
Romain LE DISEZ
317b7b98c0 Merge commit 'upstream/master' 2009-07-22 08:38:06 +02: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
Tim Almdal
9f410ec764 Always display the option menu so that modules with options that require
menu items with view permission have somewhere to hang these menu items
from.  If its empty it will get removed by $menu->compact()
2009-07-21 15:49:42 -07:00
Bharat Mediratta
0546f0df13 Fix the bug that the quick menu fires for the wrong photo. This stems
from using a single gQuickPane <div> that we move around.  A race
condition happens when you mouse over two thumbnails quickly.
Whichever server response loses the race gets displayed, and sometimes
it's the one that you're no longer hovering over.

Fix it by changing gQuickPane to be a class and creating a <div> per
thumbnail.

Fixes ticket #290.
2009-07-21 13:39:40 -07:00
Bharat Mediratta
f83db99d39 Properly display thumbnails for private movies by backtracking from
the thumbnail to the movie and then showing it as a JPG.  Fixes ticket
#570.
2009-07-21 12:26:16 -07:00
Bharat Mediratta
8f1bca7459 Remove the fallback code. It should trigger extremely rarely and seems highly inefficient to me, so let's see if we can live without it. 2009-07-21 12:18:49 -07:00
Bharat Mediratta
90ba320655 The RSS link should go to the parent album when looking at photos/movies.
Fixes ticket #566.
2009-07-21 11:25:03 -07:00
Bharat Mediratta
2de6b77d61 Use php_uname() instead of PHP_OS for greater accuracy. Fixes ticket #563. 2009-07-21 11:20:36 -07:00
Romain LE DISEZ
00b3ca82de Merge commit 'upstream/master' 2009-07-20 18:46:41 +02:00
Bharat Mediratta
60d6058880 Make some API changes simplify the tag editing code. We now have a
good pattern for allowing modules to add their own hooks to item forms!

1) Album, photo and movie forms now all use edit_item as the group and
   we publish item_edit_form and item_edit_form_completed events which
   makes it much easier in the module to handle all events.  They can
   still differentiate based on $item->type if they want to.

2) Added tag::clear_all() and tag::compact() functions which takes the
   place of hiwilson's tag::update() function and is now used in
   tag_event::item_delete().  This provides a simple API that allows
   us to have a lot less event handling code.  It's less efficient
   than what hiwilson was doing before in that it will delete and
   re-add tags, but if that ever turns out to be a performance issue
   we can do something about it then.
2009-07-20 08:51:12 -07:00
hiwilson
709d6c5faf (1)Add tag edit field in album/photo edit form. (2)provide edit functionality. (3)support multi-word tagging. 2009-07-20 08:02:07 -07:00