update from master

opensipkd/base/tools/report.py

@@ -68,13 +68,13 @@ def jasper_export(input_file, output_file=None, schema=None,
     # log.info(output_file)
     # log.info(output_file)
     # log.info(conn)
     # log.info(conn)
     # log.info(output_formats)
     # log.info(output_formats)
-
+    parameters.update({'python_version': python_version()})
     pyreportjasper.config(
     pyreportjasper.config(
         input_file,
         input_file,
         output_file,
         output_file,
         db_connection=conn,
         db_connection=conn,
         output_formats=output_formats,
         output_formats=output_formats,
-        parameters={'python_version': python_version()},
+        parameters=parameters,
         locale='en_US'
         locale='en_US'
     )
     )
     # pyreportjasper.compile(write_jasper=True)
     # pyreportjasper.compile(write_jasper=True)

opensipkd/base/views/base_views.py

@@ -8,7 +8,7 @@ from dateutil.relativedelta import relativedelta
 from opensipkd.base.views.upload import tmpstore
 from opensipkd.base.views.upload import tmpstore
 
 
 from opensipkd.tools.captcha import get_captcha
 from opensipkd.tools.captcha import get_captcha
-from opensipkd.tools.report import csv_response, pdf_response
+from opensipkd.tools.report import csv_response, file_response
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 
 
 from .common import DataTables
 from .common import DataTables
@@ -23,7 +23,7 @@ from opensipkd.tools.buttons import btn_save, btn_cancel, btn_close, btn_delete,
     btn_view, btn_add, btn_edit, btn_csv, \
     btn_view, btn_add, btn_edit, btn_csv, \
     btn_pdf
     btn_pdf
 
 
-from opensipkd.models import User
+from opensipkd.models import User, Menus
 
 
 from ..scripts.initializedb import append_csv
 from ..scripts.initializedb import append_csv
 from ..tools.api import auth_from_rpc
 from ..tools.api import auth_from_rpc
@@ -160,7 +160,7 @@ class BaseView(object):
         self.autocomplete = 'on'
         self.autocomplete = 'on'
         self.action_suffix = "/grid/act"
         self.action_suffix = "/grid/act"
         self.upload_keys = ["kode"]
         self.upload_keys = ["kode"]
-        self.pdf_rpt = ""
+        self.report_file = ""
         self.query_register=""
         self.query_register=""
 
 
     def delete_msg(self, row):
     def delete_msg(self, row):
@@ -353,10 +353,10 @@ class BaseView(object):
 
 
         raise HTTPNotFound
         raise HTTPNotFound
 
 
-    def pdf_response(self):
+    def jasper_response(self, **kwargs):
         from opensipkd.base.tools.report import jasper_export
         from opensipkd.base.tools.report import jasper_export
-        filename = jasper_export(self.pdf_rpt)
-        return pdf_response(self.req, filename=filename[0])
+        filename = jasper_export(self.report_file)
+        return file_response(self.req, filename=filename[0])
 
 
     def csv_response(self):
     def csv_response(self):
         query = self.table.query_register()
         query = self.table.query_register()
@@ -422,7 +422,7 @@ class BaseView(object):
             return self.csv_response()
             return self.csv_response()
 
 
         elif url_dict['act'] == 'pdf':
         elif url_dict['act'] == 'pdf':
-            return self.pdf_response()
+            return self.jasper_response()
 
 
         else:
         else:
             return self.next_act()
             return self.next_act()
@@ -435,8 +435,6 @@ class BaseView(object):
         if self.req.POST:
         if self.req.POST:
             if 'save' in self.req.POST:
             if 'save' in self.req.POST:
                 controls = self.req.POST.items()
                 controls = self.req.POST.items()
-                log.debug(self.req.POST.items())
-                log.debug(dict(self.req.POST.items()))
                 try:
                 try:
                     c = form.validate(controls)
                     c = form.validate(controls)
                 except ValidationFailure as e:
                 except ValidationFailure as e:

opensipkd/base/views/user.py

@@ -50,7 +50,7 @@ class Views(BaseView):
         path = os.path.dirname(__file__)
         path = os.path.dirname(__file__)
         path = os.path.dirname(path)
         path = os.path.dirname(path)
 
 
-        self.pdf_rpt = os.path.join(path, 'reports', 'users.jrxml')
+        self.report_file = os.path.join(path, 'reports', 'users.jrxml')
 
 
     def get_bindings(self, row=None):
     def get_bindings(self, row=None):
         status_list = (
         status_list = (
@@ -351,7 +351,7 @@ class AddSchema(colander.Schema):
 
 
 class EditSchema(AddSchema):
 class EditSchema(AddSchema):
     status = colander.SchemaNode(
     status = colander.SchemaNode(
-        colander.String(), widget=status_widget, title=_('Status'))
+        colander.String(), widget=widget.CheckboxWidget(true_val="1", false_val="0"), title=_('Status'))
 
 
 
 
 def get_group_list():
 def get_group_list():

opensipkd/base/views/widgets/readonly/checkbox.pt

@@ -2,12 +2,12 @@
      oid oid|field.oid;
      oid oid|field.oid;
      true_val true_val|field.widget.true_val;"
      true_val true_val|field.widget.true_val;"
      i18n:domain="deform">
      i18n:domain="deform">
-  <p class="deform-readonly-true form-control-static" 
+  <p class="deform-readonly-true" 
        id="${oid}"
        id="${oid}"
        tal:condition="cstruct == true_val"
        tal:condition="cstruct == true_val"
-       i18n:translate="">True</p>
-  <p class="deform-readonly-false form-control-static" 
+       i18n:translate=""><i class="fas fa-check-square" aria-hidden="true"></i></p>
+  <p class="deform-readonly-false" 
        id="${oid}"
        id="${oid}"
        tal:condition="cstruct != true_val"
        tal:condition="cstruct != true_val"
-       i18n:translate="">False</p>
+       i18n:translate=""><i class="fas fa-window-close" aria-hidden="true"></i></p>
 </div>
 </div>