In send_invites(), no longer implicitly assuming rate plan 0 has
notebook_collaboration set to False.
This commit is contained in:
parent
0323f6bc91
commit
8b705ec4c3
4
NEWS
4
NEWS
|
@ -1,3 +1,7 @@
|
||||||
|
1.3.22: May 8, 2008
|
||||||
|
* In send_invites(), no longer implicitly assuming rate plan 0 has
|
||||||
|
notebook_collaboration set to False.
|
||||||
|
|
||||||
1.3.21: May 8, 2008
|
1.3.21: May 8, 2008
|
||||||
* Passing new yearly parameter to main page.
|
* Passing new yearly parameter to main page.
|
||||||
|
|
||||||
|
|
|
@ -813,7 +813,8 @@ class Users( object ):
|
||||||
|
|
||||||
# except for viewer-only invites, this feature requires a rate plan above basic
|
# except for viewer-only invites, this feature requires a rate plan above basic
|
||||||
user = self.__database.load( User, user_id )
|
user = self.__database.load( User, user_id )
|
||||||
if user is None or user.username is None or ( user.rate_plan == 0 and access != u"viewer" ):
|
plan = self.__rate_plans[ user.rate_plan ]
|
||||||
|
if user is None or user.username is None or ( plan[ u"notebook_collaboration" ] != True and access != u"viewer" ):
|
||||||
raise Access_error()
|
raise Access_error()
|
||||||
|
|
||||||
if access == u"collaborator":
|
if access == u"collaborator":
|
||||||
|
|
|
@ -403,7 +403,7 @@ class Test_controller( object ):
|
||||||
{
|
{
|
||||||
u"name": u"super",
|
u"name": u"super",
|
||||||
u"storage_quota_bytes": 1337 * 10,
|
u"storage_quota_bytes": 1337 * 10,
|
||||||
u"notebook_collaboration": True,
|
u"notebook_collaboration": False,
|
||||||
u"fee": 1.99,
|
u"fee": 1.99,
|
||||||
u"yearly_fee": 19.90,
|
u"yearly_fee": 19.90,
|
||||||
u"button": u"[subscribe here user %s!] button",
|
u"button": u"[subscribe here user %s!] button",
|
||||||
|
|
Reference in New Issue