diff --git a/lib/hawat/blueprints/groups/forms.py b/lib/hawat/blueprints/groups/forms.py
index 901fd30c83f79ee853d6c85752f2a01ba1e6081c..865a31da20d94b05e379dd403d144eaaf30400dd 100644
--- a/lib/hawat/blueprints/groups/forms.py
+++ b/lib/hawat/blueprints/groups/forms.py
@@ -110,19 +110,6 @@ class BaseGroupForm(vial.forms.BaseItemForm):
],
description = lazy_gettext('Origin of the group record, whether it was added manually, or via some automated mechanism from data from some third party system.')
)
- managed = wtforms.RadioField(
- lazy_gettext('Self management:'),
- validators = [
- wtforms.validators.InputRequired(),
- ],
- choices = [
- (True, lazy_gettext('Enabled')),
- (False, lazy_gettext('Disabled'))
- ],
- filters = [vial.forms.str_to_bool],
- coerce = vial.forms.str_to_bool,
- description = lazy_gettext('Boolean flag whether the group is self managed by group managers. When enabled group managers are expected to take care of the group management tasks and they get notifications about important events like group membership requests, etc.')
- )
members = QuerySelectMultipleField(
lazy_gettext('Members:'),
query_factory = get_available_users,
diff --git a/lib/hawat/blueprints/groups/templates/groups/creatupdate.html b/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
index 3acbcfd2b566847cd210d8c587ed4ba154b42a3a..a08a12bd09fd0b63b775be2111fb05bb305d5272 100644
--- a/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
+++ b/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
@@ -19,9 +19,6 @@
{%- if form | attr('enabled') %}
{{ macros_form.render_form_item_radiobutton(form.enabled) }}
{%- endif %}
- {%- if form | attr('managed') %}
- {{ macros_form.render_form_item_radiobutton(form.managed) }}
- {%- endif %}
{%- if form | attr('members') %}
{{ macros_form.render_form_item_select(form.members) }}
{%- endif %}
diff --git a/lib/hawat/blueprints/groups/templates/groups/list.html b/lib/hawat/blueprints/groups/templates/groups/list.html
index ad108032db7573ad7d4b287d947884d9a822f427..c23eaecceb30ca2cf9dfb628bdf5aab3f20c3b13 100644
--- a/lib/hawat/blueprints/groups/templates/groups/list.html
+++ b/lib/hawat/blueprints/groups/templates/groups/list.html
@@ -47,9 +47,6 @@
<th>
{{ _('State') }}
</th>
- <th>
- {{ _('Managed') }}
- </th>
<th data-toggle="tooltip" title="{{ _('Contextual item actions') }}">
{{ get_icon('actions') }} {{ _('Actions') }}
</th>
@@ -70,9 +67,6 @@
<td>
{{ macros_site.render_label_item_state(item.enabled, True) }}
</td>
- <td>
- {{ macros_site.render_label_item_state(item.managed, True) }}
- </td>
<td class="column-actions">
{{ macros_page.render_menu_context_actions(item) }}
</td>
diff --git a/lib/hawat/blueprints/groups/templates/groups/show.html b/lib/hawat/blueprints/groups/templates/groups/show.html
index ac2087488ccf8af203073fc6d6b1e8d2aee97906..84ba2992181bd33a4a3435630df4a1577e808fac 100644
--- a/lib/hawat/blueprints/groups/templates/groups/show.html
+++ b/lib/hawat/blueprints/groups/templates/groups/show.html
@@ -86,14 +86,6 @@
{{ macros_site.render_label_item_state(item.enabled, True) }}
</td>
</tr>
- <tr>
- <th>
- {{ _('Self management') }}:
- </th>
- <td>
- {{ macros_site.render_label_item_state(item.managed, True) }}
- </td>
- </tr>
<tr>
<th>
{{ _('Reporting settings') }}:
diff --git a/lib/hawat/blueprints/groups/test/__init__.py b/lib/hawat/blueprints/groups/test/__init__.py
index c13b8159fcb3bc78f52e61c611a566d29f8ba9bd..a0a507083f15a4031ba87c83ec7e94b500523669 100644
--- a/lib/hawat/blueprints/groups/test/__init__.py
+++ b/lib/hawat/blueprints/groups/test/__init__.py
@@ -143,8 +143,7 @@ class GroupsCreateTestCase(TestRunnerMixin, ItemCreateVialTestCase):
group_data_fixture = [
('name', 'TEST_GROUP'),
('description', 'Test group for unit testing purposes.'),
- ('enabled', True),
- ('managed', True)
+ ('enabled', True)
]
def _attempt_fail(self):
diff --git a/lib/hawat/migrations/versions/c2b4c2af6196_removed_groups_managed.py b/lib/hawat/migrations/versions/c2b4c2af6196_removed_groups_managed.py
new file mode 100644
index 0000000000000000000000000000000000000000..65b60314424ed0b4152881e5bf9ce6da76791fe4
--- /dev/null
+++ b/lib/hawat/migrations/versions/c2b4c2af6196_removed_groups_managed.py
@@ -0,0 +1,24 @@
+"""Removed managed column from GroupModel
+
+Revision ID: c2b4c2af6196
+Revises: 0df0d44a1429
+Create Date: 2021-10-13 17:59:47.008910
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c2b4c2af6196'
+down_revision = '0df0d44a1429'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(): # pylint: disable=locally-disabled,missing-docstring
+ op.drop_column('groups', 'managed') # pylint: disable=locally-disabled,no-member
+
+
+def downgrade(): # pylint: disable=locally-disabled,missing-docstring
+ op.add_column('groups', sa.Column('managed', sa.BOOLEAN(), autoincrement=False, nullable=False))
diff --git a/lib/hawat/translations/cs/LC_MESSAGES/messages.po b/lib/hawat/translations/cs/LC_MESSAGES/messages.po
index 63a706f011857ad6585e3389431edd28ed3bb732..9a9c5ff3d55fc70fe86f67f7184a48fb4ab79d80 100644
--- a/lib/hawat/translations/cs/LC_MESSAGES/messages.po
+++ b/lib/hawat/translations/cs/LC_MESSAGES/messages.po
@@ -2985,19 +2985,6 @@ msgstr ""
msgid "Self management:"
msgstr "Samospráva:"
-#: ../hawat/blueprints/groups/forms.py:124
-#: ../vial/blueprints/groups/forms.py:66
-msgid ""
-"Boolean flag whether the group is self managed by group managers. When "
-"enabled group managers are expected to take care of the group management "
-"tasks and they get notifications about important events like group "
-"membership requests, etc."
-msgstr ""
-"PĹ™Ăznak, zda skupina je spravována samostatnÄ› oznaÄŤenĂ˝mi správci skupiny."
-" Pokud je aktivován očekává se od správců skupiny, že se budou o správu "
-"skupiny starat sami a k tomuto účelu budou od systému dostávat hlášenà o "
-"důležitých událostech jako žádosti o členstvà atd."
-
#: ../hawat/blueprints/groups/forms.py:127
#: ../vial/blueprints/groups/forms.py:69
msgid "Members:"
@@ -3085,10 +3072,6 @@ msgstr "do abuse skupiny"
msgid "Source"
msgstr "Zdroj"
-#: ../hawat/blueprints/groups/templates/groups/list.html:51
-msgid "Managed"
-msgstr ""
-
#: ../hawat/blueprints/groups/templates/groups/rejectmember.html:5
#: ../hawat/blueprints/users/templates/users/rejectmembership.html:5
msgid "Are you really sure you want to reject membership request of user"
@@ -5729,14 +5712,6 @@ msgid ""
"of the strings."
msgstr ""
-#: ../vial/blueprints/groups/forms.py:204
-msgid "Self-managed"
-msgstr ""
-
-#: ../vial/blueprints/groups/forms.py:205
-msgid "Not self-managed"
-msgstr ""
-
#: ../vial/blueprints/groups/forms.py:208
msgid "Search for groups with particular state."
msgstr ""
diff --git a/lib/mentat/datatype/sqldb.py b/lib/mentat/datatype/sqldb.py
index 6822b3162994c02d4324b79729669af8d254f507..f1d3ef6e3493b0639d0043cdf97b08e900808a01 100644
--- a/lib/mentat/datatype/sqldb.py
+++ b/lib/mentat/datatype/sqldb.py
@@ -341,7 +341,6 @@ class GroupModel(MODEL):
source = sqlalchemy.Column(sqlalchemy.String(50), nullable = False)
description = sqlalchemy.Column(sqlalchemy.String, nullable = False)
enabled = sqlalchemy.Column(sqlalchemy.Boolean, nullable = False, default = True)
- managed = sqlalchemy.Column(sqlalchemy.Boolean, nullable = False, default = False)
members = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_members, back_populates = 'memberships', order_by = 'UserModel.fullname')
members_wanted = sqlalchemy.orm.relationship('UserModel', secondary = _asoc_group_members_wanted, back_populates = 'memberships_wanted', order_by = 'UserModel.fullname')
@@ -397,7 +396,6 @@ class GroupModel(MODEL):
'source': str(self.source),
'description': str(self.description),
'enabled': bool(self.enabled),
- 'managed': bool(self.managed),
'members': [(x.id, x.login) for x in self.members],
'members_wanted': [(x.id, x.login) for x in self.members_wanted],
'managers': [(x.id, x.login) for x in self.managers],
diff --git a/lib/vial/blueprints/groups/__init__.py b/lib/vial/blueprints/groups/__init__.py
index 43ef6eca3975777289fa96fb094ac0846eea656b..b7d31eb2c624a0cdd7d5f87c7aafbc0d3095d31a 100644
--- a/lib/vial/blueprints/groups/__init__.py
+++ b/lib/vial/blueprints/groups/__init__.py
@@ -140,10 +140,6 @@ class ListView(HTMLMixin, SQLAlchemyMixin, ItemListView):
query = query.filter(model.enabled == True)
elif form_args['state'] == 'disabled':
query = query.filter(model.enabled == False)
- elif form_args['state'] == 'managed':
- query = query.filter(model.managed == True)
- elif form_args['state'] == 'notmanaged':
- query = query.filter(model.managed == False)
# Adjust query based on record source selection.
if 'source' in form_args and form_args['source']:
query = query\
diff --git a/lib/vial/blueprints/groups/forms.py b/lib/vial/blueprints/groups/forms.py
index 5de09e03094011162fa503e18bd2901c97a4b466..53ce5ff20a17931551741e0048a56e1b521666a7 100644
--- a/lib/vial/blueprints/groups/forms.py
+++ b/lib/vial/blueprints/groups/forms.py
@@ -52,19 +52,6 @@ class BaseGroupForm(vial.forms.BaseItemForm):
],
description = lazy_gettext('Origin of the group record, whether it was added manually, or via some automated mechanism from data from some third party system.')
)
- managed = wtforms.RadioField(
- lazy_gettext('Self management:'),
- validators = [
- wtforms.validators.InputRequired(),
- ],
- choices = [
- (True, lazy_gettext('Enabled')),
- (False, lazy_gettext('Disabled'))
- ],
- filters = [vial.forms.str_to_bool],
- coerce = vial.forms.str_to_bool,
- description = lazy_gettext('Boolean flag whether the group is self managed by group managers. When enabled group managers are expected to take care of the group management tasks and they get notifications about important events like group membership requests, etc.')
- )
members = QuerySelectMultipleField(
lazy_gettext('Members:'),
query_factory = vial.forms.get_available_users,
@@ -200,9 +187,7 @@ class GroupSearchForm(vial.forms.BaseSearchForm):
choices = [
('', lazy_gettext('Nothing selected')),
('enabled', lazy_gettext('Enabled')),
- ('disabled', lazy_gettext('Disabled')),
- ('managed', lazy_gettext('Self-managed')),
- ('notmanaged', lazy_gettext('Not self-managed'))
+ ('disabled', lazy_gettext('Disabled'))
],
default = '',
description = lazy_gettext('Search for groups with particular state.')
diff --git a/lib/vial/blueprints/groups/templates/groups/creatupdate.html b/lib/vial/blueprints/groups/templates/groups/creatupdate.html
index 3acbcfd2b566847cd210d8c587ed4ba154b42a3a..a08a12bd09fd0b63b775be2111fb05bb305d5272 100644
--- a/lib/vial/blueprints/groups/templates/groups/creatupdate.html
+++ b/lib/vial/blueprints/groups/templates/groups/creatupdate.html
@@ -19,9 +19,6 @@
{%- if form | attr('enabled') %}
{{ macros_form.render_form_item_radiobutton(form.enabled) }}
{%- endif %}
- {%- if form | attr('managed') %}
- {{ macros_form.render_form_item_radiobutton(form.managed) }}
- {%- endif %}
{%- if form | attr('members') %}
{{ macros_form.render_form_item_select(form.members) }}
{%- endif %}
diff --git a/lib/vial/blueprints/groups/templates/groups/show.html b/lib/vial/blueprints/groups/templates/groups/show.html
index 74129aa8b04cd4fa1685e83d7d704a8a87639579..fdf42a305d999da0e774b650289bc97f05e13193 100644
--- a/lib/vial/blueprints/groups/templates/groups/show.html
+++ b/lib/vial/blueprints/groups/templates/groups/show.html
@@ -68,14 +68,6 @@
{{ macros_site.render_label_item_state(item.enabled, True) }}
</td>
</tr>
- <tr>
- <th>
- {{ _('Self management') }}:
- </th>
- <td>
- {{ macros_site.render_label_item_state(item.managed, True) }}
- </td>
- </tr>
</tbody>
</table>
</div>
diff --git a/lib/vial/blueprints/groups/test/__init__.py b/lib/vial/blueprints/groups/test/__init__.py
index 5e51ec2f87f71c8566bde33a8996796dd8d6d3df..a45d1e9d35de4e63af58bb2d86693987421d1821 100644
--- a/lib/vial/blueprints/groups/test/__init__.py
+++ b/lib/vial/blueprints/groups/test/__init__.py
@@ -147,8 +147,7 @@ class GroupsCreateTestCase(TestRunnerMixin, ItemCreateVialTestCase):
group_data_fixture = [
('name', 'TEST_GROUP'),
('description', 'Test group for unit testing purposes.'),
- ('enabled', True),
- ('managed', True)
+ ('enabled', True)
]
def _attempt_fail(self):
diff --git a/lib/vial/view/__init__.py b/lib/vial/view/__init__.py
index 47c8e4aa12da33d98b76b12e35ffb48ba71a0ced..13d65f4348f89794fea67bf565955634ae8b7ad3 100644
--- a/lib/vial/view/__init__.py
+++ b/lib/vial/view/__init__.py
@@ -1976,17 +1976,10 @@ class BaseRegisterView(ItemCreateView): # pylint: disable=locally-disabled,abst
account.login, group.name
)
)
- if not group.managed:
- flask.current_app.logger.info(
- "Unable to send information about registration of new account '{}' to managers of group '{}': group is not marked as self managed.".format(
- account.login, group.name
- )
- )
- return
if not group.managers:
- flask.current_app.logger.error(
- "Unable to send information about registration of new account '{}' to managers of group '{}': group is marked as self managed, but there are no managers configured.".format(
+ flask.current_app.logger.info(
+ "Unable to send information about registration of new account '{}' to managers of group '{}': there are no managers configured.".format(
account.login, group.name
)
)