Fixed EOL damage in org_app and access checks
authorSverre Rabbelier <srabbelier@gmail.com>
Mon, 02 Feb 2009 15:34:45 +0000
changeset 1182 5bea281505f4
parent 1181 6fb4134e1dfc
child 1183 03db1f6d222a
Fixed EOL damage in org_app and access checks Patch by: Sverre Rabbelier
app/soc/views/models/org_app.py
--- a/app/soc/views/models/org_app.py	Mon Feb 02 15:04:04 2009 +0000
+++ b/app/soc/views/models/org_app.py	Mon Feb 02 15:34:45 2009 +0000
@@ -1,93 +1,96 @@
-#!/usr/bin/python2.5
-#
-# Copyright 2008 the Melange authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Views for Organization App profiles.
-"""
-
-__authors__ = [
-    '"Lennard de Rijk" <ljvderijk@gmail.com>',
-  ]
-
-
-from django import forms
-
-from soc.logic import dicts
-from soc.logic.models import org_app as org_app_logic
-from soc.views.helper import access
-from soc.views.models import group_app
-
-import soc.logic.dicts
-
-
-class View(group_app.View):
-  """View methods for the Organization Application model.
-  """
-
-  def __init__(self, params=None):
-    """Defines the fields and methods required for the base View class
-    to provide the user with list, public, create, edit and delete views.
-
-    Params:
-      params: a dict with params for this View
-    """
-
-    #TODO(ljvderijk) do the right rights check
-    rights = access.Checker(params)
-    rights['create'] = ['checkIsDeveloper']
-    rights['delete'] = [('checkIsMyApplication', org_app_logic)]
-    rights['edit'] = [('checkIsMyApplication', org_app_logic)]
-    rights['list'] = ['checkIsDeveloper']
-    rights['public'] = [('checkIsMyApplication', org_app_logic)]
-    rights['review'] = ['checkIsDeveloper']
-
-    new_params = {}
-
-    new_params['rights'] = rights
-    new_params['logic'] = org_app_logic.logic
-
-    new_params['sidebar_grouping'] = 'Organization'
-
-    new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status',
-        'created_on', 'last_modified_on']
-    # TODO(ljvderijk) add cleaning method to ensure uniqueness
-    new_params['create_extra_dynafields'] = {
-            'scope_path': forms.fields.CharField(widget=forms.HiddenInput,
-                                             required=True)}
-
-    new_params['name'] = "Organization Application"
-    new_params['name_plural'] = "Organization Applications"
-    new_params['name_short'] = "Org App"
-    new_params['url_name'] = "org_app"
-    new_params['group_url_name'] = 'org'
-
-    new_params['review_template'] = 'soc/org_app/review.html'
-
-    params = dicts.merge(params, new_params)
-
-    super(View, self).__init__(params=params)
-
-
-view = View()
-
-create = view.create
-delete = view.delete
-edit = view.edit
-list = view.list
-public = view.public
-export = view.export
-review = view.review
-review_overview = view.reviewOverview
-
+#!/usr/bin/python2.5
+#
+# Copyright 2008 the Melange authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Views for Organization App profiles.
+"""
+
+__authors__ = [
+    '"Lennard de Rijk" <ljvderijk@gmail.com>',
+  ]
+
+
+from django import forms
+
+from soc.logic import dicts
+from soc.logic.models import org_app as org_app_logic
+from soc.views.helper import access
+from soc.views.models import group_app
+
+import soc.logic.dicts
+
+
+class View(group_app.View):
+  """View methods for the Organization Application model.
+  """
+
+  def __init__(self, params=None):
+    """Defines the fields and methods required for the base View class
+    to provide the user with list, public, create, edit and delete views.
+
+    Params:
+      params: a dict with params for this View
+    """
+
+    #TODO(ljvderijk) do the right rights check
+    rights = access.Checker(params)
+    rights['create'] = ['checkIsDeveloper']
+    rights['delete'] = [('checkIsMyEntity',
+                       [org_app_logic.logic, 'applicant', True])]
+    rights['edit'] = [('checkIsMyEntity',
+                       [org_app_logic.logic, 'applicant', True])]
+    rights['list'] = ['checkIsDeveloper']
+    rights['public'] = [('checkIsMyEntity',
+                       [org_app_logic.logic, 'applicant', True])]
+    rights['review'] = ['checkIsDeveloper']
+
+    new_params = {}
+
+    new_params['rights'] = rights
+    new_params['logic'] = org_app_logic.logic
+
+    new_params['sidebar_grouping'] = 'Organization'
+
+    new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status',
+        'created_on', 'last_modified_on']
+    # TODO(ljvderijk) add cleaning method to ensure uniqueness
+    new_params['create_extra_dynafields'] = {
+            'scope_path': forms.fields.CharField(widget=forms.HiddenInput,
+                                             required=True)}
+
+    new_params['name'] = "Organization Application"
+    new_params['name_plural'] = "Organization Applications"
+    new_params['name_short'] = "Org App"
+    new_params['url_name'] = "org_app"
+    new_params['group_url_name'] = 'org'
+
+    new_params['review_template'] = 'soc/org_app/review.html'
+
+    params = dicts.merge(params, new_params)
+
+    super(View, self).__init__(params=params)
+
+
+view = View()
+
+create = view.create
+delete = view.delete
+edit = view.edit
+list = view.list
+public = view.public
+export = view.export
+review = view.review
+review_overview = view.reviewOverview
+