lucaspalomodevelop/eventcally
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/eventcally.git synced 2026-03-13 00:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #294 from DanielGrams/issue/293

Browse Source 
Nur globale Admins und Mitglieder bestimmter Organisationen dürfen Or…
This commit is contained in:
Daniel Grams 2021-09-08 15:39:36 +02:00 committed by GitHub
commit c684789cb1
14 changed files with 148 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
messages.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-07 22:54+0200\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -235,7 +235,15 @@ msgstr ""
msgid "If set, the organization can work with suggestions."
msgstr ""
#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4
#: project/forms/admin.py:37
msgid "Create other organizations"
msgstr ""
#: project/forms/admin.py:38
msgid "If set, members of the organization can create other organizations."
msgstr ""
#: project/forms/admin.py:43 project/templates/admin/update_admin_unit.html:4
#: project/templates/admin/update_admin_unit.html:8
msgid "Update organization"
msgstr ""

29
migrations/versions/e759ca20884f_.py Normal file
View File

@ -0,0 +1,29 @@
"""empty message
Revision ID: e759ca20884f
Revises: 4a5c083c649b
Create Date: 2021-09-08 14:38:28.975242
"""
import sqlalchemy as sa
import sqlalchemy_utils
from alembic import op
from project import dbtypes
# revision identifiers, used by Alembic.
revision = "e759ca20884f"
down_revision = "4a5c083c649b"
branch_labels = None
depends_on = None
def upgrade():
op.add_column(
"adminunit",
sa.Column("can_create_other", sa.Boolean(), server_default="0", nullable=False),
)
def downgrade():
op.drop_column("adminunit", "can_create_other")

6
project/access.py
View File

@ -189,7 +189,11 @@ def can_create_admin_unit():
if not app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"]:
return True
return has_current_user_role("admin")
if has_current_user_role("admin"):
return True
admin_units = get_admin_units_for_manage()
return any(admin_unit.can_create_other for admin_unit in admin_units)
def can_read_event(event: Event) -> bool:

1
project/cli/test.py
View File

@ -115,6 +115,7 @@ def _create_admin_unit(user_id, name):
admin_unit.short_name = name.lower().replace(" ", "")
admin_unit.incoming_reference_requests_allowed = True
admin_unit.suggestions_enabled = True
admin_unit.can_create_other = True
admin_unit.location = Location()
admin_unit.location.postalCode = "38640"
admin_unit.location.city = "Goslar"

7
project/forms/admin.py
View File

@ -33,4 +33,11 @@ class UpdateAdminUnitForm(FlaskForm):
description=lazy_gettext("If set, the organization can work with suggestions."),
validators=[Optional()],
)
can_create_other = BooleanField(
lazy_gettext("Create other organizations"),
description=lazy_gettext(
"If set, members of the organization can create other organizations."
),
validators=[Optional()],
)
submit = SubmitField(lazy_gettext("Update organization"))

8
project/models.py
View File

@ -399,6 +399,14 @@ class AdminUnit(db.Model, TrackableMixin):
server_default="0",
)
)
can_create_other = deferred(
Column(
Boolean(),
nullable=False,
default=False,
server_default="0",
)
)
outgoing_relations = relationship(
"AdminUnitRelation",
primaryjoin=remote(AdminUnitRelation.source_admin_unit_id) == id,

1
project/templates/admin/update_admin_unit.html
View File

@ -17,6 +17,7 @@
<div class="card-body">
{{ render_field_with_errors(form.incoming_reference_requests_allowed, ri="switch") }}
{{ render_field_with_errors(form.suggestions_enabled, ri="switch") }}
{{ render_field_with_errors(form.can_create_other, ri="switch") }}
</div>
</div>

BIN
project/translations/de/LC_MESSAGES/messages.mo
View File

Binary file not shown.

12
project/translations/de/LC_MESSAGES/messages.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-07 22:54+0200\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"PO-Revision-Date: 2020-06-07 18:51+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@ -238,7 +238,15 @@ msgstr "Vorschläge aktiv"
msgid "If set, the organization can work with suggestions."
msgstr "Wenn gesetzt, kann die Organisation mit Vorschlägen arbeiten."
#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4
#: project/forms/admin.py:37
msgid "Create other organizations"
msgstr "Andere Organisationen erstellen"
#: project/forms/admin.py:38
msgid "If set, members of the organization can create other organizations."
msgstr "Wenn gesetzt, können Mitglieder der Organisation andere Organisationen erstellen."
#: project/forms/admin.py:43 project/templates/admin/update_admin_unit.html:4
#: project/templates/admin/update_admin_unit.html:8
msgid "Update organization"
msgstr "Organisation aktualisieren"

BIN
project/translations/en/LC_MESSAGES/messages.mo
View File

Binary file not shown.

12
project/translations/en/LC_MESSAGES/messages.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-07 22:54+0200\n"
"POT-Creation-Date: 2021-09-08 14:40+0200\n"
"PO-Revision-Date: 2021-04-30 15:04+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@ -236,7 +236,15 @@ msgstr ""
msgid "If set, the organization can work with suggestions."
msgstr ""
#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4
#: project/forms/admin.py:37
msgid "Create other organizations"
msgstr ""
#: project/forms/admin.py:38
msgid "If set, members of the organization can create other organizations."
msgstr ""
#: project/forms/admin.py:43 project/templates/admin/update_admin_unit.html:4
#: project/templates/admin/update_admin_unit.html:8
msgid "Update organization"
msgstr ""

9
tests/seeder.py
View File

@ -44,7 +44,13 @@ class Seeder(object):
return user_id
def create_admin_unit(self, user_id, name="Meine Crew", suggestions_enabled=True):
def create_admin_unit(
self,
user_id,
name="Meine Crew",
suggestions_enabled=True,
can_create_other=False,
):
from project.models import AdminUnit
from project.services.admin_unit import insert_admin_unit_for_user
from project.services.user import get_user
@ -56,6 +62,7 @@ class Seeder(object):
admin_unit.short_name = name.lower().replace(" ", "")
admin_unit.incoming_reference_requests_allowed = True
admin_unit.suggestions_enabled = suggestions_enabled
admin_unit.can_create_other = can_create_other
insert_admin_unit_for_user(admin_unit, user)
self._db.session.commit()
admin_unit_id = admin_unit.id

3
tests/views/test_admin.py
View File

@ -119,6 +119,7 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro
admin_unit = AdminUnit.query.get_or_404(admin_unit_id)
admin_unit.incoming_reference_requests_allowed = False
admin_unit.suggestions_enabled = False
admin_unit.can_create_other = False
db.session.commit()
url = utils.get_url("admin_admin_unit_update", id=admin_unit_id)
@ -133,6 +134,7 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro
{
"incoming_reference_requests_allowed": "y",
"suggestions_enabled": "y",
"can_create_other": "y",
},
)
@ -148,3 +150,4 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro
admin_unit = AdminUnit.query.get_or_404(admin_unit_id)
assert admin_unit.incoming_reference_requests_allowed
assert admin_unit.suggestions_enabled
assert admin_unit.can_create_other

60
tests/views/test_admin_unit.py
View File

@ -71,17 +71,69 @@ def test_create_duplicate(client, app, utils, seeder):
assert b"duplicate" in response.data
def test_create_requiresadmin_nonadmin(client, app, utils, seeder):
def test_create_requiresAdmin_nonAdmin(client, app, utils, seeder):
app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = True
seeder.create_user()
user_id = utils.login()
seeder.create_admin_unit(user_id, "Meine Crew")
utils.login()
response = client.get("/admin_unit/create")
url = utils.get_url("admin_unit_create")
response = utils.get(url)
utils.assert_response_redirect(response, "manage_admin_units")
def test_create_requiresAdmin_globalAdmin(client, app, utils, seeder):
app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = True
seeder.create_user(admin=True)
utils.login()
url = utils.get_url("admin_unit_create")
response = utils.get_ok(url)
response = utils.post_form(
url,
response,
{
"name": "Meine Crew",
"short_name": "meine_crew",
"location-postalCode": "38640",
"location-city": "Goslar",
},
)
assert response.status_code == 302
def test_create_requiresAdmin_memberOfOrgWithoutFlag(client, app, utils, seeder):
app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = True
seeder.setup_base()
url = utils.get_url("admin_unit_create")
response = utils.get(url)
utils.assert_response_redirect(response, "manage_admin_units")
def test_create_requiresAdmin_memberOfOrgWithFlag(client, app, utils, seeder):
app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = True
user_id = seeder.create_user(admin=False)
utils.login()
seeder.create_admin_unit(user_id, can_create_other=True)
url = utils.get_url("admin_unit_create")
response = utils.get_ok(url)
response = utils.post_form(
url,
response,
{
"name": "Other Crew",
"short_name": "other_crew",
"location-postalCode": "38640",
"location-city": "Goslar",
},
)
assert response.status_code == 302
def test_update(client, app, utils, seeder):
seeder.create_user()
user_id = utils.login()