# HG changeset patch # User Lennard de Rijk # Date 1233428573 0 # Node ID 18d0e10b02f78ace15cf717cecfc9a4d9233604c # Parent 69a9134c5c7ef55b8ce3cbf5614a775b5461df89 Added a view and templates for the organization admin. This means that org admins can now be created/invited. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed diff -r 69a9134c5c7e -r 18d0e10b02f7 app/soc/templates/soc/org_admin/list/heading.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/org_admin/list/heading.html Sat Jan 31 19:02:53 2009 +0000 @@ -0,0 +1,4 @@ + + Organization ID + Admin ID + diff -r 69a9134c5c7e -r 18d0e10b02f7 app/soc/templates/soc/org_admin/list/row.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/org_admin/list/row.html Sat Jan 31 19:02:53 2009 +0000 @@ -0,0 +1,8 @@ + +
{{ list.item.scope_path }} +
+ +
{{ list.item.link_id }}
+ diff -r 69a9134c5c7e -r 18d0e10b02f7 app/soc/templates/soc/org_admin/manage.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/org_admin/manage.html Sat Jan 31 19:02:53 2009 +0000 @@ -0,0 +1,28 @@ +{% extends "soc/org_admin/public.html" %} +{% comment %} +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. +{% endcomment %} + +{% block header_title %} +{{ page_name }} {{ entity.link_id }} for {{ entity.scope_path }} +{% endblock %} + +{% block manage %} + + + Please select the appropriate action:
+ + + + +{% endblock %} diff -r 69a9134c5c7e -r 18d0e10b02f7 app/soc/templates/soc/org_admin/public.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/templates/soc/org_admin/public.html Sat Jan 31 19:02:53 2009 +0000 @@ -0,0 +1,31 @@ +{% extends "soc/base.html" %} +{% comment %} +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. +{% endcomment %} +{% load forms_helpers %} + +{% block header_title %} +{{ page_name }} {{ entity.link_id }} for {{ entity.scope_path }} +{% endblock %} + +{% block body %} +

+ + {% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %} + {% readonly_field_as_table_row entity.fields.display_name.label entity.display_name %} + {% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %} + {% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %} +
+

+{% block manage %} {% endblock %} +{% endblock %} diff -r 69a9134c5c7e -r 18d0e10b02f7 app/soc/views/models/org_admin.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/soc/views/models/org_admin.py Sat Jan 31 19:02:53 2009 +0000 @@ -0,0 +1,128 @@ +#!/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 Admins. +""" + +__authors__ = [ + '"Lennard de Rijk" ' + ] + + +from django import forms + +from soc.logic import dicts +from soc.logic.models import organization as org_logic +from soc.views.helper import access +from soc.views.helper import dynaform +from soc.views.helper import widgets +from soc.views.models import organization as org_view +from soc.views.models import role + +import soc.logic.models.org_admin + + +class View(role.View): + """View methods for the Organization Admin 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 + """ + + rights = access.Checker(params) + rights['create'] = ['checkIsDeveloper'] + rights['edit'] = [('checkIsMyActiveRole', soc.logic.models.org_admin)] + rights['delete'] = ['checkIsDeveloper'] + # TODO accessCheck checkIsAdministratorForOrg + rights['invite'] = ['checkIsDeveloper'] + rights['accept_invite'] = [('checkCanCreateFromRequest', 'org_admin')] + # TODO accessCheck checkIsAdministratorForOrg + rights['process_request'] = ['checkIsDeveloper', + ('checkCanProcessRequest', 'org_admin')] + rights['manage'] = [ + ('checkIsAllowedToManageRole', [soc.logic.models.org_admin, + soc.logic.models.org_admin])] + + new_params = {} + new_params['logic'] = soc.logic.models.org_admin.logic + new_params['group_logic'] = org_logic.logic + new_params['group_view'] = org_view.view + new_params['rights'] = rights + + new_params['scope_view'] = org_view + + new_params['name'] = "Organization Admin" + new_params['module_name'] = "org_admin" + new_params['sidebar_grouping'] = 'Organizations' + + new_params['extra_dynaexclude'] = ['agreed_to_tos'] + + new_params['allow_invites'] = True + + params = dicts.merge(params, new_params) + + super(View, self).__init__(params=params) + + # register the role with the group_view + params['group_view'].registerRole(params['module_name'], self) + + # create and store the special form for invited users + updated_fields = { + 'link_id': forms.CharField(widget=widgets.ReadOnlyInput(), + required=False)} + + invited_create_form = dynaform.extendDynaForm( + dynaform = self._params['create_form'], + dynafields = updated_fields) + + params['invited_create_form'] = invited_create_form + + def _editPost(self, request, entity, fields): + """See base.View._editPost(). + """ + if not entity: + fields['user'] = fields['link_id'] + fields['link_id'] = fields['user'].link_id + + super(View, self)._editPost(request, entity, fields) + + def _acceptInvitePost(self, fields, request, context, params, **kwargs): + """Fills in the fields that were missing in the invited_created_form. + + For params see base.View._acceptInvitePost() + """ + # fill in the appropriate fields that were missing in the form + fields['user'] = fields['link_id'] + fields['link_id'] = fields['user'].link_id + + +view = View() + +accept_invite = view.acceptInvite +create = view.create +delete = view.delete +edit = view.edit +invite = view.invite +list = view.list +manage = view.manage +process_request = view.processRequest +public = view.public +export = view.export