perubahan dari view_upload ke view_import upload dan import

1 parent 2202f042
...@@ -5,10 +5,7 @@ import locale ...@@ -5,10 +5,7 @@ import locale
import logging import logging
from sqlalchemy import or_ from sqlalchemy import or_
import re import re
from .routes import routes from .routes import routes
try: try:
from urllib import (urlencode, quote, quote_plus, ) from urllib import (urlencode, quote, quote_plus, )
except ImportError: except ImportError:
...@@ -156,11 +153,10 @@ def add_global(event): ...@@ -156,11 +153,10 @@ def add_global(event):
event['get_params'] = get_params event['get_params'] = get_params
event['get_urls'] = get_urls event['get_urls'] = get_urls
event['get_csrf_token'] = get_csrf_token event['get_csrf_token'] = get_csrf_token
event['get_base_menus'] = BASE_CLASS.get_menus()
# event['get_params'] = get_params # event['get_params'] = get_params
# event['get_module_menus'] = get_module_menus # event['get_module_menus'] = get_module_menus
# event['get_module_submenus'] = get_module_submenus # event['get_module_submenus'] = get_module_submenus
event['get_base_menus'] = BASE_CLASS.get_menus()
# def get_params(request, params, alternate=None, settings=None): # def get_params(request, params, alternate=None, settings=None):
# return get_params(params, alternate, settings) # return get_params(params, alternate, settings)
...@@ -223,7 +219,7 @@ def get_ini_params(request, params=None, alternate=None, settings=None): ...@@ -223,7 +219,7 @@ def get_ini_params(request, params=None, alternate=None, settings=None):
def get_id_card_folder(ext=None, settings=None): def get_id_card_folder(ext=None, settings=None):
_logging.debug('get_id_card_folder') _logging.debug('get_id_card_folder')
idcard_files = get_params("partner_idcard_folder", idcard_files = get_params("partner_idcard_folder",
'/tmp/idcard', settings=settings) '/tmp/idcard/', settings=settings)
if ext: if ext:
idcard_files += ext idcard_files += ext
# if ext and os.sep != '/': # if ext and os.sep != '/':
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
requires = ['setuptools >= 64', 'wheel'] requires = ['setuptools >= 64', 'wheel']
build-backend = 'setuptools.build_meta' build-backend = 'setuptools.build_meta'
[tool.hatch.build]
dev-mode-dirs = ["."]
[tool.mypy] [tool.mypy]
exclude = [ exclude = [
'base', 'base',
...@@ -12,14 +15,12 @@ exclude = [ ...@@ -12,14 +15,12 @@ exclude = [
show_error_codes = true show_error_codes = true
[[tool.mypy.overrides]] [[tool.mypy.overrides]]
module = [ module = [
"opensipkd.base.*", "opensipkd.base.*",
"opensipkd.models.*", "opensipkd.models.*",
"opensipkd.detable.*", "opensipkd.detable.*",
"opensipkd.jsonrpc_auth.*", "opensipkd.jsonrpc_auth.*",
] ]
warn_unused_ignores = true warn_unused_ignores = true
strict = true strict = true
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!