m3-users 2.2.14__tar.gz → 2.3.0__tar.gz

{m3-users-2.2.14/src/m3_users.egg-info → m3_users-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: m3-users
-Version: 2.2.14
+Version: 2.3.0
 Summary: Пользователи и роли
 Home-page: https://github.com/barsgroup/m3-users
 Author: BARS Group
@@ -11,17 +11,10 @@ Classifier: Environment :: Web Environment
 Classifier: Natural Language :: Russian
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Classifier: Framework :: Django :: 1.5
-Classifier: Framework :: Django :: 1.6
-Classifier: Framework :: Django :: 1.7
-Classifier: Framework :: Django :: 1.8
-Classifier: Framework :: Django :: 1.9
-Classifier: Framework :: Django :: 1.10
 Classifier: Framework :: Django :: 1.11
 Classifier: Framework :: Django :: 2.0
+Classifier: Framework :: Django :: 4.0
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.6
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Development Status :: 5 - Production/Stable
@@ -29,3 +22,11 @@ License-File: LICENSE
 Requires-Dist: m3-builder>=1.0.1
 Requires-Dist: m3-django-compat>=1.7.1
 Requires-Dist: m3-ui
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary

{m3-users-2.2.14 → m3_users-2.3.0}/changelog.md

@@ -1,4 +1,11 @@
 ## История изменений
+**2.3.0**
+- Добавлена поддержка django 4.0
+
+**2.2.15**
+- Добавлена активация чекбокса выбранных прав доступа для роли в `SelectPermissionWindow`.
+- Добавлена возможность удалить право доступа для роли деактивацией чекбокса.
+
 **2.2.14**
 - Добавлена обязательная проверка прав доступа для паков `UsersActions`, `RolesActions` и `Roles_DictPack`:
   по-умолчанию доступ к экшенам данных паков имеет только супер-администратор.

{m3-users-2.2.14 → m3_users-2.3.0}/setup.py

@@ -1,6 +1,10 @@
 # coding: utf-8
 import os
-from setuptools import setup, find_packages
+
+from setuptools import (
+    find_packages,
+    setup,
+)
 
 
 setup(
@@ -11,7 +15,7 @@ setup(
     author_email='bars@bars-open.ru',
     package_dir={'': 'src'},
     packages=find_packages('src'),
-    description=u'Пользователи и роли',
+    description='Пользователи и роли',
     install_requires=(
         'm3-builder>=1.0.1',
         'm3-django-compat>=1.7.1',
@@ -24,26 +28,15 @@ setup(
         'Natural Language :: Russian',
         'Natural Language :: English',
         'Operating System :: OS Independent',
-        'Framework :: Django :: 1.5',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 4.0',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.6',
         'License :: OSI Approved :: MIT License',
         'Development Status :: 5 - Production/Stable',
     ],
-    dependency_links=(
-        'http://pypi.bars-open.ru/simple/m3-builder',
-    ),
-    setup_requires=(
-        'm3-builder>=1.0.1',
-    ),
+    dependency_links=('http://pypi.bars-open.ru/simple/m3-builder',),
+    setup_requires=('m3-builder>=1.0.1',),
     set_build_info=os.path.dirname(__file__),
 )

m3_users-2.3.0/src/m3_users/app_meta.py

@@ -0,0 +1,77 @@
+# coding: utf-8
+
+from django.urls import (
+    re_path,
+)
+from m3 import (
+    authenticated_user_required,
+)
+from m3.actions import (
+    ActionController,
+)
+
+from .constants import (
+    ADMIN,
+    GENERIC_USER,
+    SUPER_ADMIN,
+)
+from .metaroles import (
+    Metaroles_DictPack,
+    UserMetarole,
+)
+from .roles import (
+    Roles_DictPack,
+    RolesActions,
+)
+from .users import (
+    UsersActions,
+)
+
+
+# контроллер
+users_controller = ActionController(url='/m3-users', name='Пользователи М3')
+
+
+def register_actions():
+    users_controller.packs.extend(
+        [
+            RolesActions(),
+            UsersActions(),
+            Roles_DictPack(),
+            Metaroles_DictPack(),  # метароли пользователей
+        ]
+    )
+
+
+@authenticated_user_required
+def users_view(request):
+    return users_controller.process_request(request)
+
+
+def register_urlpatterns():
+    return [
+        re_path(r'^m3-users', users_view),
+    ]
+
+
+def register_metaroles(manager):
+    """
+    Функция возвращает список метаролей, которые регистрируются
+    по умолчанию на уровне Платформы М3.
+
+    :param manager: менеджер, отвечающий за управление метаролями.
+    :type manager: :py:class:`m3_users.metaroles.MetaroleManager`
+    """
+
+    # метароль обычного пользователя системы
+    manager.GENERIC_USER_METAROLE = UserMetarole(GENERIC_USER, 'Обобщенный пользователь')
+
+    # метароль администратора системы
+    manager.ADMIN_METAROLE = UserMetarole(ADMIN, 'Администратор')
+    manager.ADMIN_METAROLE.included_metaroles.extend([manager.GENERIC_USER_METAROLE])
+
+    # метароль супер-администратора системы
+    manager.SUPER_ADMIN_METAROLE = UserMetarole(SUPER_ADMIN, 'Супер-администратор')
+    manager.SUPER_ADMIN_METAROLE.included_metaroles.extend([manager.GENERIC_USER_METAROLE, manager.ADMIN_METAROLE])
+
+    return [manager.GENERIC_USER_METAROLE, manager.ADMIN_METAROLE, manager.SUPER_ADMIN_METAROLE]

{m3-users-2.2.14 → m3_users-2.3.0}/src/m3_users/roles.py

@@ -248,8 +248,16 @@ class AddRolePermission(Action):
     need_check_permission = True
     verbose_name = u'Добавление прав'
 
+    def context_declaration(self):
+        return {
+            'perms': {
+                'type': 'str_list',
+                'default': [],
+            },
+        }
+
     def run(self, request, context):
-        window = SelectPermissionWindow()
+        window = SelectPermissionWindow(action_context=context,)
         return ExtUIScriptResult(window)
 
 
@@ -378,9 +386,8 @@ class GetRolePermissionAction(Action):
         return ExtGridDataQueryResult(res)
 
 
-def get_all_permission_tree():
-    """
-    Общий подход к формированию дерева прав доступа (алгоритм):
+def get_all_permission_tree(permission_codes):
+    """Общий подход к формированию дерева прав доступа (алгоритм):
     собирается список прав доступа исходя из наборов действий, действий,
     субправ наборов действий, субправ действий
     у каждого элемента списка прав должен быть путь в дереве (пока строкой),
@@ -389,11 +396,15 @@ def get_all_permission_tree():
     то по иерархии этого элемента в фактической структуре действий
     и набора действий.
 
+    Args:
+        permission_codes: Список активных кодов прав доступа (для активации чекбокса).
+    Returns:
+        Список прав доступа.
     """
 
     class PermProxy(ExtTreeNode):
         def __init__(self, id, parent=None, name='', url='', can_select=True,
-                     fullname=None, path=''):
+                     fullname=None, path='', checked=False,):
             super(PermProxy, self).__init__()
             self.parent = parent
             if parent:
@@ -404,6 +415,7 @@ def get_all_permission_tree():
             self.items['name'] = name
             self.items['url'] = url
             self.items['fullname'] = fullname if fullname else name
+            self.checked = checked
             self.can_check = can_select
 
     def find_node(node_name, parent_node, res):
@@ -523,10 +535,11 @@ def get_all_permission_tree():
                     fullname = '%s - %s' % (pack_name, value)
                     path = get_actionpack_sub_perm_path(action_set, key)
                     url = action_set.get_sub_permission_code(key)
+                    checked = url in permission_codes
                     if url not in res_urls.keys():
                         child4 = PermProxy(
                             len(res) + 1, None, value, url, True,
-                            fullname, path)
+                            fullname, path, checked,)
                         res.append(child4)
                         res_urls[url] = child4
             # обработаем подчиненные Наборы
@@ -549,10 +562,11 @@ def get_all_permission_tree():
                 if action_set.need_check_permission:
                     path = get_action_perm_path(action_set)
                     url = action_set.get_permission_code()
+                    checked = url in permission_codes
                     if url not in res_urls.keys():
                         item = PermProxy(
                             len(res) + 1, None, name, url, True,
-                            fullname, path)
+                            fullname, path, checked,)
                         res.append(item)
                         res_urls[url] = item
                 # у действия берем подчиненные права
@@ -568,10 +582,11 @@ def get_all_permission_tree():
                     fullname = '%s - %s' % (pack_name, name)
                     path = get_action_sub_perm_path(action_set, key)
                     url = action_set.get_sub_permission_code(key)
+                    checked = url in permission_codes
                     if not url in res_urls.keys():
                         child3 = PermProxy(
                             len(res) + 1, None, name, url,
-                            True, fullname, path)
+                            True, fullname, path, checked,)
                         res.append(child3)
                         res_urls[url] = item
 
@@ -934,7 +949,7 @@ class SelectPermissionWindow(windows.ExtEditWindow):
         self.tree = ExtTree()
         self.tree.add_column(header=u'Имя', data_index='name', width=140)
         self.tree.master_column_id = 'name'
-        self.tree.nodes = get_all_permission_tree()
+        self.tree.nodes = get_all_permission_tree(self.action_context.perms)
         self.items.append(self.tree)
         self.buttons.append(controls.ExtButton(
             text=u'Выбрать', handler='''function select(btn, e, baseParams) {

{m3-users-2.2.14 → m3_users-2.3.0}/src/m3_users/templates/m3-users/edit-role-window.js

@@ -7,6 +7,23 @@ function getJsonOfStore(store){
     return Ext.util.JSON.encode(datar);
 }
 
+function getPermissionCodes(store){
+    {# Получение выбранных кодов прав доступа из store #}
+    var permissionCodes = [],
+        records = store.getRange();
+
+    for (var i = 0; i < records.length; i++) {
+        permissionCodes.push(records[i].data.permission_code);
+    }
+
+    return Ext.util.JSON.encode(permissionCodes);
+}
+
+function addPermissionCodesInParams(grid, req){
+    {# Добавление в контекст выбранных кодов прав доступа #}
+    req.params.perms = getPermissionCodes(grid.getStore());
+}
+
 function beforeSubmit(submit){
     {# сохранение роли #}
     var store = Ext.getCmp('{{ component.grid.client_id }}').getStore(),
@@ -21,19 +38,18 @@ function addPermission(grid, res, opt) {
     win.on('closed_ok', function (sels) {
         var store = this.getStore(),
             count = store.getCount();
+        store.removeAll();
         for(var i = 0, len = sels.length; i < len; i++){
             var record = sels[i];
-            if (!store.getById(record.attributes.url)) {
-                var rec = new store.recordType(
-                    {
-                        id: null,
-                        "permission_code":record.attributes.url,
-                        "verbose_name": record.attributes.fullname,
-                        "disabled": false
-                    },
-                    record.attributes.url);
-                store.add(rec);
-            }
+            var rec = new store.recordType(
+                {
+                    id: null,
+                    "permission_code":record.attributes.url,
+                    "verbose_name": record.attributes.fullname,
+                    "disabled": false
+                },
+                record.attributes.url);
+            store.add(rec);
         }
     }, scope = grid);
     win.show();
@@ -44,6 +60,7 @@ var form = Ext.getCmp('{{ component.client_id }}'),
     grid = Ext.getCmp('{{ component.grid.client_id }}');
 form.on('beforesubmit', beforeSubmit);
 grid.on('afternewrequest', addPermission);
+grid.on('beforenewrequest', addPermissionCodesInParams);
 
 function deletePermission() {
     {# обработчик удаления роли #}

{m3-users-2.2.14 → m3_users-2.3.0/src/m3_users.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: m3-users
-Version: 2.2.14
+Version: 2.3.0
 Summary: Пользователи и роли
 Home-page: https://github.com/barsgroup/m3-users
 Author: BARS Group
@@ -11,17 +11,10 @@ Classifier: Environment :: Web Environment
 Classifier: Natural Language :: Russian
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Classifier: Framework :: Django :: 1.5
-Classifier: Framework :: Django :: 1.6
-Classifier: Framework :: Django :: 1.7
-Classifier: Framework :: Django :: 1.8
-Classifier: Framework :: Django :: 1.9
-Classifier: Framework :: Django :: 1.10
 Classifier: Framework :: Django :: 1.11
 Classifier: Framework :: Django :: 2.0
+Classifier: Framework :: Django :: 4.0
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.6
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Development Status :: 5 - Production/Stable
@@ -29,3 +22,11 @@ License-File: LICENSE
 Requires-Dist: m3-builder>=1.0.1
 Requires-Dist: m3-django-compat>=1.7.1
 Requires-Dist: m3-ui
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary

m3_users-2.3.0/src/tests/manage.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python
+import importlib
+import os
+import sys
+
+from django.core.management import (
+    execute_from_command_line,
+)
+
+
+project_path = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(project_path, '../'))
+sys.path.insert(0, os.path.join(project_path, '../env'))
+sys.path.insert(0, os.path.join(project_path, '../env/m3/vendor'))
+
+settings_module = 'settings'
+
+try:
+    importlib.import_module(settings_module)
+except ImportError:
+    import sys
+
+    sys.stderr.write(
+        "Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things."
+        "\nYou'll have to run django-admin, passing it your settings module."
+        "\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__
+    )
+    sys.exit(1)
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings_module)
+
+if __name__ == '__main__':
+    execute_from_command_line(sys.argv)

m3_users-2.3.0/src/tests/urls.py

@@ -0,0 +1,24 @@
+from django.urls import (
+    include,
+    path,
+)
+from m3.helpers import (
+    urls,
+)
+
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = [
+    # Example:
+    # path('', your_view_function),
+    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+    # to INSTALLED_APPS to enable admin documentation:
+    # path('admin/doc/', include('django.contrib.admindocs.urls')),
+    # Uncomment the next line to enable the admin:
+    # path('admin/', admin.site.urls),
+]
+
+urlpatterns += urls.get_app_urlpatterns()

{m3-users-2.2.14 → m3_users-2.3.0}/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/2.2.14^0
-VERSION = 2.2.14
-REVISION = 0c4ec223074579d36879f93c508e13ba70bab361
-VERSION_DATE = 20.05.2024
-REVISION_DATE = 20.05.2024
+BRANCH = tags/2.3.0
+VERSION = 2.3.0
+REVISION = c746d57f02bb8fde5bf095b9d36415b5332beb01
+VERSION_DATE = 17.07.2025
+REVISION_DATE = 17.07.2025

m3-users-2.2.14/src/m3_users/app_meta.py

@@ -1,65 +0,0 @@
-# coding: utf-8
-
-from django.conf.urls import url
-from m3 import authenticated_user_required
-from m3.actions import ActionController
-
-from .constants import ADMIN, GENERIC_USER, SUPER_ADMIN
-from .metaroles import UserMetarole, Metaroles_DictPack
-from .roles import RolesActions, Roles_DictPack
-from .users import UsersActions
-
-
-# контроллер
-users_controller = ActionController(url='/m3-users', name=u'Пользователи М3')
-
-
-def register_actions():
-
-    users_controller.packs.extend([
-        RolesActions(),
-        UsersActions(),
-        Roles_DictPack(),
-        Metaroles_DictPack(),  # метароли пользователей
-    ])
-
-
-@authenticated_user_required
-def users_view(request):
-    return users_controller.process_request(request)
-
-
-def register_urlpatterns():
-    return [
-        url(r'^m3-users', users_view),
-    ]
-
-
-def register_metaroles(manager):
-    """
-    Функция возвращает список метаролей, которые регистрируются
-    по умолчанию на уровне Платформы М3.
-
-    :param manager: менеджер, отвечающий за управление метаролями.
-    :type manager: :py:class:`m3_users.metaroles.MetaroleManager`
-    """
-
-    # метароль обычного пользователя системы
-    manager.GENERIC_USER_METAROLE = UserMetarole(
-        GENERIC_USER, u'Обобщенный пользователь')
-
-    # метароль администратора системы
-    manager.ADMIN_METAROLE = UserMetarole(ADMIN, u'Администратор')
-    manager.ADMIN_METAROLE.included_metaroles.extend(
-        [manager.GENERIC_USER_METAROLE])
-
-    # метароль супер-администратора системы
-    manager.SUPER_ADMIN_METAROLE = UserMetarole(
-        SUPER_ADMIN, u'Супер-администратор')
-    manager.SUPER_ADMIN_METAROLE.included_metaroles.extend(
-        [manager.GENERIC_USER_METAROLE, manager.ADMIN_METAROLE])
-
-    return [
-        manager.GENERIC_USER_METAROLE,
-        manager.ADMIN_METAROLE,
-        manager.SUPER_ADMIN_METAROLE]

m3-users-2.2.14/src/tests/manage.py

@@ -1,20 +0,0 @@
-#!/usr/bin/python
-import os,sys
-project_path = os.path.dirname(__file__)
-
-
-sys.path.insert(0, os.path.join(project_path, '../'))
-sys.path.insert(0, os.path.join(project_path, '../env'))
-sys.path.insert(0, os.path.join(project_path, '../env/m3/vendor'))
-
-from django.core.management import execute_manager
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)

m3-users-2.2.14/src/tests/urls.py

@@ -1,22 +0,0 @@
-from django.conf.urls.defaults import *
-
-from m3.helpers import urls
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    # Example:
-    # (r'^m3project/', include('m3project.foo.urls')),
-
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # (r'^admin/', include(admin.site.urls)),
-    #(r'^$', ),
-)
-
-urlpatterns += urls.get_app_urlpatterns()