perbaikan widget_os

opensipkd/base/__init__.py

@@ -103,12 +103,17 @@ def has_permission_(request, perm_names, context=None):
         if request.has_permission(perm_name, context):
             return True
 
+def has_modules_(module_name, context=None):
+    modules = get_params("pyramid.includes").split("\n")
+    return module_name in modules
+
 def _get_params(request, params, default=None, settings=None, context=None):
     return get_params(params, default, settings)
 
 @subscriber(BeforeRender)
 def add_global(event):
     event['has_permission'] = has_permission_
+    event['has_modules'] = has_modules_
     event['urlencode'] = urlencode
     event['quote_plus'] = quote_plus
     event['quote'] = quote
@@ -421,6 +426,7 @@ def main(global_config, **settings):
     config.add_request_method(get_address2, 'address2', reify=True)
     config.add_request_method(get_app_name, 'app_name', reify=True)
     config.add_request_method(get_modules, 'modules', reify=True)
+    config.add_request_method(has_modules_, 'has_modules', reify=True)
     config.add_request_method(get_menus, 'menus', reify=True)
     config.add_request_method(thousand, 'thousand', reify=True)
     config.add_request_method(is_devel, 'devel', reify=True)

opensipkd/base/views/base_views.py

@@ -188,7 +188,9 @@ class BaseView(object):
         if self.list_schema:
             allow_edit = kwargs.get("allow_edit", True)
             allow_delete = kwargs.get("allow_delete", True)
-            table = DeTable(self.list_schema(),
+            schema = self.list_schema()
+            schema = schema.bind(request=self.req)
+            table = DeTable(schema,
                             action=self.req.route_url(self.list_route),
                             action_suffix="/grid/act",
                             buttons=self.list_buttons,

opensipkd/base/views/widget_os.py

@@ -300,7 +300,7 @@ class ImageWidget(Widget):
     readonly_template = "image"
     strip = True
     requirements = ()
-
+    height = "30px"
     def __init__(self, **kw):
         super().__init__(**kw)
 

opensipkd/base/views/widgets/image.pt

@@ -2,7 +2,9 @@
     css_class css_class|field.widget.css_class;
     oid oid|field.oid;
     style style|field.widget.style;
-    "
-     tal:omit-tag="">
-    <img style="height:30px; width:auto; margin-bottom:5px;" src="${cstruct}">
+    height height|field.widget.height;
+    width 'auto'|field.widget.width;
+    " tal:omit-tag="">
+    <img id="${oid}" style="height:${height}; width:auto; margin-bottom:5px;" src="${cstruct}">
+<!--?    <p><a href="${cstruct}">Download</a></p>-->
 </span>

opensipkd/detable/detable.py

@@ -184,12 +184,12 @@ class DeTable(field.Field):
             if hasattr(f, 'orderable'):
                 d["orderable"] = f.orderable
                 data.append(f"orderable: {f.orderable}")
-
             if hasattr(f, "url"):
-                request = kw.get("request")
-                if request:
-                    d["url"] = request.static_url(f.url)
-                    log.debug(d["url"])
+                d["url"]=f.url
+                # request = kw.get("request")
+                # if request:
+                #     d["url"] = request.static_url(f.url)
+                #     log.debug(d["url"])
 
             if hasattr(f, "action"):
                 d["action"] = f.action

opensipkd/detable/templates/detable.pt

@@ -79,7 +79,7 @@
         } else if (${tableid}Columns[co].hasOwnProperty("url")) {
           let url = ${tableid}Columns[co].url;
           ${tableid}Columns[co].render = function (data) {
-            let result = '<a href="' + url + '/' + data + '" target="_blank">Link</a>&nbsp;';
+            let result = '<a href="' + url + data + '" target="_blank">Link</a>&nbsp;';
             return result;
           }
         } else if (${tableid}Columns[co].data === "id" && ${tableid}Columns[co].action === true) {