Commit Graph

1654 Commits

Author SHA1 Message Date
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
Chad Kieffer
04ed02fedd Updated wording of tag separator tip 2009-07-26 15:57:26 -06: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
Tim Almdal
00cd2b646d fix for ticket #574. The user->url database wasn't being set when the user was updated via the admin panel. 2009-07-25 15:00:57 -07:00
Tim Almdal
7a6952720c Pass the variable when the "user_edit_form" event is fired. 2009-07-25 14:48:10 -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
0bf69c63d8 Don't escape & in JS text; it triggers the "Disallowed key characters
in global data." check in the Input library.
2009-07-23 16:58:26 -07:00
Bharat Mediratta
0e9b80d2ef Updated golden file 2009-07-23 16:20:40 -07:00
Tim Almdal
b0475ca450 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-23 11:59:10 -07:00
Tim Almdal
67190412e6 Respect the $type parameter on Tag_Model::items_count() 2009-07-23 11:57:34 -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
913d63b1a0 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-23 10:43:40 -07:00
Bharat Mediratta
1fbdf1a1e0 Add form processing events:
user_add_form_admin            admin adding a user
 user_edit_form_admin           admin editing a user
 user_add_form_admin_completed  successfully added a user (admin)
 user_edit_form                 user editing their own settings
 user_edit_form_completed       successfully edited a user (admin and user editing own settings)
2009-07-23 10:35:52 -07:00
Tim Almdal
070884d9e2 Fix for ticket #496. replace the src attribute (non standard) with the title attribute to contain the url of the tag cloud controller. 2009-07-23 10:23:00 -07:00
Bharat Mediratta
41b8f943a6 Convert instances of theme_url() to just url() to match the API change
made in dbeadc1407
2009-07-23 10:20:49 -07:00
Tim Almdal
ac23b9be18 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-23 09:29:29 -07:00
Tim Almdal
fa0c17ab5b Make tag handling consistent by converting spaces to periods and using commas or semi-colons as separators 2009-07-23 09:26:04 -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
Romain LE DISEZ
386130114b Merge commit 'upstream/master' 2009-07-23 18:08:57 +02:00
Bharat Mediratta
5999ccb512 Remove extra error log line 2009-07-23 08:40:00 -07:00
Bharat Mediratta
6a8cace027 Test cleanup:
1) Specifically catch Kohana_404_Exception and let other exceptions pass, the
   test framework will report them as errors
2) Simplify some testing idioms
3) Change malicious address to a legal addr
2009-07-23 08:37:39 -07:00
Tim Almdal
7c2cea01a5 Fix for ticket #502
This patch allows users with only view permission to request fullsize
prints using Digibug.  There is now a Digibug config file that contains
the IP ranges of the Digibug servers.  Any request for the full size
image via the print proxy must come from within the ranges in the config
file.

The reason for the "if (!Test_Mode) {..." is that the print proxy makes a
call to Kohana::close_buffers, which closes all the output buffers and then
we see the image download on the console which messes up the test output.
2009-07-23 07:02:10 -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
c8d215bf80 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-22 14:28:33 -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
427e1130b2 Modified the notification get_subscribers to ignore any users that don't
have "view" access to the item the notification is being generated for.
Fix for ticket: #538.
2009-07-22 11:11:48 -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