From 9d7966730f4e28ebbf9737c0d8c0e9528d881555 Mon Sep 17 00:00:00 2001 From: MZhiyenbayev Date: Tue, 31 Jan 2023 18:29:23 +0600 Subject: [PATCH 1/2] [org_admin][s]: restricted org admins to create new user --- ckanext/portalopendatadk/controller.py | 2 + .../templates/organization/member_new.html | 106 ++++++++++++++++++ .../templates/user/dashboard.html | 2 +- 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 ckanext/portalopendatadk/templates/organization/member_new.html diff --git a/ckanext/portalopendatadk/controller.py b/ckanext/portalopendatadk/controller.py index 2389b08..5a2e48a 100644 --- a/ckanext/portalopendatadk/controller.py +++ b/ckanext/portalopendatadk/controller.py @@ -35,6 +35,8 @@ def __before__(self, action, **env): # else redirect to the home page if not user_has_admin_access(False) and action != 'request_reset': h.redirect_to(controller='home', action='index') + if not authz.is_sysadmin(c.user) and action == 'register': + h.redirect_to(controller='home', action='index') def new(self, data=None, errors=None, error_summary=None): '''GET to display a form for registering a new user. diff --git a/ckanext/portalopendatadk/templates/organization/member_new.html b/ckanext/portalopendatadk/templates/organization/member_new.html new file mode 100644 index 0000000..6d8ef06 --- /dev/null +++ b/ckanext/portalopendatadk/templates/organization/member_new.html @@ -0,0 +1,106 @@ +{% extends "organization/edit_base.html" %} + +{% import 'macros/form.html' as form %} + +{% set user = user_dict %} + +{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %} + +{% block primary_content_inner %} + {% link_for _('Back to all members'), named_route=group_type+'.members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %} +

+ {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %} +

+ {% block form %} +
+ {{ h.csrf_input() }} +
+
+
+ {% if not user %} + +

+ {{ _('If you wish to add an existing user, search for their username below.') }} +

+ {% endif %} +
+ {% if user %} + + + {% else %} + + {% endif %} +
+
+
+ {% if c.userobj.sysadmin %} +
+
+ {{ _('or') }} +
+
+
+
+ +

+ {{ _('If you wish to invite a new user, enter their email address.') }} +

+
+ +
+
+
+ {% endif %} +
+ + {% if user and user.name == c.user and user_role == 'admin' %} + {% set format_attrs = {'data-module': 'autocomplete', 'disabled': 'disabled'} %} + {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }} + {{ form.hidden('role', value=user_role) }} + {% else %} + {% set format_attrs = {'data-module': 'autocomplete'} %} + {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }} + {% endif %} + +
+ {% if user %} + {{ _('Delete') }} + + {% else %} + + {% endif %} +
+
+ {% endblock %} +{% endblock %} + +{% block secondary_content %} +{{ super() }} +
+

+ + {{ _('What are roles?') }} +

+
+ {% trans %} +

Admin: Can add/edit and delete datasets, as well as + manage organization members.

+

Editor: Can add and edit datasets, but not manage + organization members.

+

Member: Can view the organization's private + datasets, but not add new datasets.

+ {% endtrans %} +
+
+{% endblock %} diff --git a/ckanext/portalopendatadk/templates/user/dashboard.html b/ckanext/portalopendatadk/templates/user/dashboard.html index 98c45bf..f4a2b38 100644 --- a/ckanext/portalopendatadk/templates/user/dashboard.html +++ b/ckanext/portalopendatadk/templates/user/dashboard.html @@ -13,7 +13,7 @@ {% block page_header %}
- {% if h.user_has_admin_access(False) %} + {% if c.userobj.sysadmin %} {% link_for _('Create an Account'), controller='user', action='register', class_='btn', icon='plus' %} {% endif %} {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %} From c9a191d8ce931cd3681349c7c9bc8362e09ebec0 Mon Sep 17 00:00:00 2001 From: MZhiyenbayev Date: Tue, 31 Jan 2023 18:52:14 +0600 Subject: [PATCH 2/2] [member_new][xs]: updated template to the right version, previous was for the latest ckan --- .../templates/organization/member_new.html | 80 ++++++++----------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/ckanext/portalopendatadk/templates/organization/member_new.html b/ckanext/portalopendatadk/templates/organization/member_new.html index 6d8ef06..c6a8d48 100644 --- a/ckanext/portalopendatadk/templates/organization/member_new.html +++ b/ckanext/portalopendatadk/templates/organization/member_new.html @@ -2,76 +2,61 @@ {% import 'macros/form.html' as form %} -{% set user = user_dict %} +{% set user = c.user_dict %} -{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %} +{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} - {{ super() }}{% endblock %} {% block primary_content_inner %} - {% link_for _('Back to all members'), named_route=group_type+'.members', id=organization.name, class_='btn btn-default pull-right', icon='arrow-left' %} + {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %}

{% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}

{% block form %} -
- {{ h.csrf_input() }} -
-
-
- {% if not user %} - -

- {{ _('If you wish to add an existing user, search for their username below.') }} -

+ +
+
+ {% if not user %} + + + {{ _('If you wish to add an existing user, search for their username below.') }} + + {% endif %} +
+ {% if user %} + + + {% else %} + {% endif %} -
- {% if user %} - - - {% else %} - - {% endif %} -
{% if c.userobj.sysadmin %} -
{{ _('or') }}
-
-
-
-
{% endif %}
- - {% if user and user.name == c.user and user_role == 'admin' %} - {% set format_attrs = {'data-module': 'autocomplete', 'disabled': 'disabled'} %} - {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }} - {{ form.hidden('role', value=user_role) }} - {% else %} - {% set format_attrs = {'data-module': 'autocomplete'} %} - {{ form.select('role', label=_('Role'), options=roles, selected=user_role, error='', attrs=format_attrs) }} - {% endif %} - + {% set format_attrs = {'data-module': 'autocomplete'} %} + {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
{% if user %} - {{ _('Delete') }} + {{ _('Delete') }} @@ -102,5 +87,4 @@

datasets, but not add new datasets.

{% endtrans %}

-
-{% endblock %} +{% endblock %} \ No newline at end of file