Ryan Bates
5d97cfb236
releasing 1.6.2
2011-03-18 09:44:39 -07:00
Ryan Bates
7688025404
fixing instance loading with :singleton option - closes #310
2011-03-18 09:42:30 -07:00
Ryan Bates
3efa069349
fixing failing MetaWhere spec
2011-03-18 09:14:17 -07:00
Ryan Bates
b0c1646fee
releasing 1.6.1
2011-03-15 23:40:14 -07:00
Ryan Bates
3f6cecbfcf
use Item.new instead of build_item for singleton resource so it doesn't mess up database - closes #304
2011-03-15 23:37:05 -07:00
Ryan Bates
fdd5ad022d
making accessible_by action default to :index and parent action default to :show so we don't check :read action directly - closes #302
2011-03-15 23:00:40 -07:00
Adam Wróbel
3639ca90eb
Fixes inherited_resources collection authorization
...
This reverts e3eab13b86
I don't know what was the idea of that, but it turned out REAL bad.
`collection` sets the collection instance variable. `resource_base` is used all
over CanCan. It's also used inside `load_collection?` which is checked before
`load_collection` is called. That means we actually set the collection instance
variable through inherited_resources (without any authorization whatsoever) before trying to load it through CanCan using `accessible_by`.
1. def load_resource
2. unless skip?(:load)
3. if load_instance?
4. self.resource_instance ||= load_resource_instance
5. elsif load_collection?
6. self.collection_instance ||= load_collection
7. end
8. end
9. end
`collection_instance` is set on line 5 instead of line 6.
2011-03-16 01:20:35 +01:00
Ryan Bates
efa3ff1c0f
releasing 1.6.0
2011-03-10 23:59:13 -08:00
Ryan Bates
9bee4a8d4b
adding any/all support for MetaWhere conditions
2011-03-08 23:19:56 -08:00
Ryan Bates
eb2826f135
adding more MetaWhere comparison operators
2011-03-08 22:21:42 -08:00
Ryan Bates
a49269175e
Merge branch 'master' into meta_where
2011-03-08 22:05:40 -08:00
Ryan Bates
0de43c445b
raise an error when trying to make a rule with both hash conditions and a block - closes #269
2011-03-08 17:20:32 -08:00
Ryan Bates
f9b181af05
allow Active Record scope to be passed as Ability conditions - closes #257
2011-03-08 17:08:26 -08:00
Ryan Bates
80f1ab20fb
adding :if and :unless options to check_authorization - closes #284
2011-03-08 16:35:01 -08:00
Ryan Bates
37102fe6f8
load collection resources in custom controller actions with no id param - closes #296
2011-03-08 16:10:40 -08:00
Ryan Bates
ba999970b1
add space in multiword model in I18n unauthorized message - closes #292
2011-03-08 15:56:23 -08:00
Ryan Bates
951d70e057
adding :prepend option to load_and_authorize_resource - closes #290
2011-03-08 15:50:34 -08:00
Ryan Bates
3a07d62782
fixing spec for Inherited Resource parent loading
2011-03-08 15:39:15 -08:00
Ryan Bates
2c2fa306cc
Merge branch 'master' of https://github.com/stefanoverna/cancan into stefanoverna-master
2011-03-08 15:33:47 -08:00
Ryan Bates
28a9a0ac07
Merge branch 'inherited_resources_collection_fix' of https://github.com/tanordheim/cancan into tanordheim-inherited_resources_collection_fix
2011-03-08 15:24:14 -08:00
Ryan Bates
bcf2756ad2
simplifying .rvmrc
2011-03-08 15:23:31 -08:00
Ryan Bates
c53ed1e497
raise a NotImplemented exception if it's an unrecognized MetaWhere condition
2011-03-08 11:06:46 -08:00
Ryan Bates
07088a0cdc
making it easier to test all MetaWhere conditions
2011-03-08 10:52:49 -08:00
Ryan Bates
ff5aaf543b
adding initial MetaWhere support
2011-03-08 10:37:25 -08:00
Ryan Bates
52435e97d9
fixing association conditions when MetaWhere is installed (thanks acmetech) - closes #261
2011-03-08 10:07:36 -08:00
Trond Arve Nordheim
e3eab13b86
Use collection instead of end_of_association_chain in the inherited_resources integration, as per suggested by aq1018
2011-03-08 10:45:34 +01:00
Ryan Bates
79995e4309
adding Lock It Down section to readme
2011-02-22 09:37:53 -08:00
Stefano Verna
8722fbc7a5
Fix for deeply nested resources when using inherited resources
2011-02-17 22:31:17 +01:00
Ryan Bates
3901cbe499
fixing tests for passing action name through to accessible_by call
2011-02-14 10:33:53 -08:00
Ryan Bates
471d54ce01
Merge branch 'pass_action_to_accessible_by' of https://github.com/amw/cancan into amw-pass_action_to_accessible_by
2011-02-14 10:28:59 -08:00
Sam Pohlenz
f23bbe04ef
Fix rule check on Hash-like subjects
2011-02-04 16:46:57 +10:30
Adam Wróbel
f1ea21b2a6
Pass action name to accessible_by.
2011-02-03 17:00:46 +01:00
Ryan Bates
b2028c8aa7
moving :alert into redirect_to call in documentation
2011-01-28 09:53:07 -08:00
Ryan Bates
929579f03b
releasing 1.5.1
2011-01-20 10:16:01 -08:00
Ryan Bates
f9ad4858f5
handle deeply nested conditions properly in active record adapter - closes #246
2011-01-20 10:12:46 -08:00
Ryan Bates
5c4c179c5a
cleaning up mongoid adapter a little
2011-01-19 10:17:21 -08:00
Ryan Bates
78cbea5733
Merge branch 'master' of https://github.com/stellard/cancan into stellard-master
2011-01-19 09:25:08 -08:00
stellard
cff922915e
improved test assertion
2011-01-18 21:47:33 +00:00
Ryan Bates
2012311c40
readme improvements
2011-01-18 11:55:46 -08:00
stellard
55c8a5045b
added cannot support and multiple can support
2011-01-18 18:28:03 +00:00
stellard
344832d199
updated mongoid
2011-01-18 18:27:53 +00:00
Ryan Bates
52b33589dc
changing flash[:error] to flash[:alert] in rdocs - closes #238
2011-01-18 09:19:22 -08:00
Ryan Bates
04522c9bc6
releasing 1.5.0
2011-01-11 00:24:49 -08:00
Ryan Bates
120eafeabd
updating readme for 1.5
2011-01-11 00:21:42 -08:00
Ryan Bates
e49190fc21
fixing link in readme
2011-01-08 21:48:19 -08:00
Ryan Bates
39bffe91ab
fixing github links in readme
2011-01-08 13:25:45 -08:00
Ryan Bates
3885f469d5
updating changelog
2011-01-08 13:06:00 -08:00
Ryan Bates
e2910a74ee
moving parts of the README into wiki pages
2011-01-08 12:36:32 -08:00
Ryan Bates
57327119a8
adding skip load and authorize behavior - closes #164
2011-01-08 12:04:55 -08:00
Ryan Bates
71ceb83ded
Merge branch 'bowsersenior-master'
2011-01-07 11:55:35 -08:00