diff --git a/paramecio2/libraries/db/extrafields/imagefield.py b/paramecio2/libraries/db/extrafields/imagefield.py
index fa1f7df..af0ae94 100644
--- a/paramecio2/libraries/db/extrafields/imagefield.py
+++ b/paramecio2/libraries/db/extrafields/imagefield.py
@@ -3,8 +3,7 @@ import sys
from pathlib import Path
from paramecio2.libraries.db.corefields import CharField
from paramecio2.libraries.db.extraforms.fileform import FileForm
-from paramecio.citoplasma import httputils
-from paramecio.citoplasma.keyutils import create_key
+from paramecio2.libraries.keyutils import create_key
import traceback
from bottle import request
diff --git a/paramecio2/libraries/db/extrafields/slugifyfield.py b/paramecio2/libraries/db/extrafields/slugifyfield.py
index 43816e6..9ed7348 100644
--- a/paramecio2/libraries/db/extrafields/slugifyfield.py
+++ b/paramecio2/libraries/db/extrafields/slugifyfield.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
from paramecio2.libraries.db.corefields import CharField
-from paramecio.citoplasma.slugify import slugify
+from slugify import slugify
from paramecio2.libraries.db.coreforms import HiddenForm
class SlugifyField(CharField):
diff --git a/paramecio2/libraries/db/usermodel.py b/paramecio2/libraries/db/usermodel.py
index 9853c94..0362986 100644
--- a/paramecio2/libraries/db/usermodel.py
+++ b/paramecio2/libraries/db/usermodel.py
@@ -95,10 +95,10 @@ class UserModel(WebModel):
"""
#get_id=getpostfiles.get.get(self.name_field_id, '0')
- get_id=requests.args.get(self.name_field_id, '0')
+ get_id=request.args.get(self.name_field_id, '0')
#post_id=getpostfiles.post.get(self.name_field_id, '0')
- post_id=requests.form.get(self.name_field_id, '0')
+ post_id=request.form.get(self.name_field_id, '0')
if get_id!='0':
get_id=int(get_id)
diff --git a/paramecio2/libraries/lists.py b/paramecio2/libraries/lists.py
index 36bcdc2..af5d849 100644
--- a/paramecio2/libraries/lists.py
+++ b/paramecio2/libraries/lists.py
@@ -3,7 +3,8 @@
from paramecio2.libraries.pages import Pages
from paramecio2.libraries.urls import add_get_parameters
from paramecio2.libraries.i18n import I18n
-from flask import request, session
+#from flask import request, session
+from paramecio2.libraries.get_data import get_query_args
import sys
import re
@@ -55,7 +56,8 @@ class SimpleList:
try:
- self.begin_page=int(request.args.get('begin_page', '0'))
+ #self.begin_page=int(request.args.get('begin_page', '0'))
+ self.begin_page=int(get_query_args('begin_page', '0'))
except ValueError:
self.begin_page=0
@@ -80,7 +82,8 @@ class SimpleList:
def obtain_order(self):
- self.order=request.args.get('order', self.order) #self.getpostfiles.get.get('order', self.order)
+ #self.order=request.args.get('order', self.order) #self.getpostfiles.get.get('order', self.order)
+ self.order=get_query_args('order', self.order)
order_k=int(self.order)
@@ -99,7 +102,7 @@ class SimpleList:
def obtain_field_search(self):
- self.order_field=request.args.get('order_field', self.order_field)
+ self.order_field=get_query_args('order_field', self.order_field)
field_k=self.order_field
@@ -132,13 +135,13 @@ class SimpleList:
def search(self):
- self.search_text=request.args.get('search_text', '')
+ self.search_text=get_query_args('search_text', '')
self.search_text=self.search_text.replace('"', '"')
#self.model.conditions='AND
- self.search_field=request.args.get('search_field', '')
+ self.search_field=get_query_args('search_field', '')
if self.search_field not in self.model.fields.keys():
self.search_field=''
@@ -243,9 +246,9 @@ class AjaxList(SimpleList):
def show(self):
- begin_page=int(request.args.get('position', 0))
- order_field=request.args.get('order_field', '')
- order=request.args.get('order', 0)
+ begin_page=int(get_query_args('position', 0))
+ order_field=get_query_args('order_field', '')
+ order=get_query_args('order', 0)
limit=self.limit
arr_order=['ASC', 'DESC']
diff --git a/paramecio2/libraries/slugify.py b/paramecio2/libraries/slugify.py
new file mode 100644
index 0000000..3989296
--- /dev/null
+++ b/paramecio2/libraries/slugify.py
@@ -0,0 +1,5 @@
+from slugify import slugify as slugify_func
+
+def slugify(slug, *args, **wargs):
+
+ return slugify_func(slug, *args, **wargs)
diff --git a/paramecio2/libraries/templates/forms/dateform.phtml b/paramecio2/libraries/templates/forms/dateform.phtml
index 78f9249..6b6d852 100644
--- a/paramecio2/libraries/templates/forms/dateform.phtml
+++ b/paramecio2/libraries/templates/forms/dateform.phtml
@@ -1,4 +1,4 @@
-${add_js_home_local('jquery.min.js', 'admin')}
+${add_js('jquery.min.js', 'admin')}
diff --git a/setup.py b/setup.py
index 145213b..db2a291 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(name='paramecio2',
url='https://bitbucket.org/paramecio/paramecio2fm/',
packages=['paramecio2'],
include_package_data=True,
- install_requires=['flask', 'pymysql', 'sqlalchemy', 'colorama'],
+ install_requires=['flask', 'pymysql', 'sqlalchemy', 'colorama', 'python-slugify'],
entry_points={'console_scripts': [
'paramecio2 = paramecio2.console:start', 'paramecio2db = paramecio2.libraries.db.dbadmin:start',
]},