${lang('common', 'add_item', 'Add new item')}
${admin.list.show()|n} diff --git a/paramecio2/libraries/urls.py b/paramecio2/libraries/urls.py index b91f25b..7de0f2b 100644 --- a/paramecio2/libraries/urls.py +++ b/paramecio2/libraries/urls.py @@ -53,7 +53,28 @@ def make_external_url(path, query_args={}): get_query='?'+urllib.parse.urlencode(query_args) return path+get_query + +def add_get_parameters(url, **args): + + """ + This is a method for add args to existent url + + Keyword arguments: + url -- The url + args -- a ser of get variables for add to url + + """ + added_url='&' + + if url.find('?')==-1: + added_url='?' + + get_query=urllib.parse.urlencode(args) + + return url+added_url+get_query + + if config.yes_static==True: def make_media_url(file_path, module): diff --git a/paramecio2/modules/admin/admin/ausers.py b/paramecio2/modules/admin/admin/ausers.py index 2c9e5bb..cf6bbea 100644 --- a/paramecio2/modules/admin/admin/ausers.py +++ b/paramecio2/modules/admin/admin/ausers.py @@ -1,5 +1,37 @@ from settings import config +from flask import g, url_for +from paramecio2.modules.admin.models.admin import UserAdmin +from paramecio2.libraries.generate_admin_class import GenerateAdminClass +from paramecio2.libraries.i18n import I18n +from paramecio2.libraries.db.coreforms import SelectForm -def admin(): + +def admin(**args): - return "admin users" + t=args['t'] + + connection=g.connection + + user_admin=UserAdmin(connection) + + user_admin.fields['privileges'].name_form=SelectForm + + user_admin.create_forms(['username', 'password', 'email', 'privileges', 'lang']) + + user_admin.forms['privileges'].arr_select={0: I18n.lang('admin', 'without_privileges', 'Without privileges'), 1: I18n.lang('admin', 'selected_privileges', 'Selected privileges'), 2: I18n.lang('admin', 'administrator', 'Administrator')} + + user_admin.fields['password'].protected=False + + url=url_for('.admin', module='ausers') + + admin=GenerateAdminClass(user_admin, url, t) + + admin.list.fields_showed=['username', 'privileges'] + + admin.list.search_fields=['username'] + + admin.arr_fields_edit=['username', 'password', 'repeat_password', 'email', 'privileges', 'lang'] + + form_admin=admin.show() + + return form_admin diff --git a/paramecio2/modules/admin/app.py b/paramecio2/modules/admin/app.py index 880f4b8..275c739 100644 --- a/paramecio2/modules/admin/app.py +++ b/paramecio2/modules/admin/app.py @@ -90,8 +90,8 @@ for app_load in config_admin.values(): #print(app_load[1]) @admin_app.route('/admin') -@admin_app.route('/admin/