Merge branch 'latest' of https://git.opensipkd.com/aa.gusti/opensipkd-base into latest

Ari Agung Prasetiyo
Commit 0a796250 authored Nov 19, 2024 by Ari Agung Prasetiyo
Showing 5 changed files with 40 additions and 38 deletions
opensipkd/base/__init__.py
opensipkd/base/scripts/data/routes.csv
opensipkd/base/views/base_views.py
opensipkd/base/views/routes.py
opensipkd/models/users.py
--- a/opensipkd/base/__init__.py
+++ b/opensipkd/base/__init__.py
@@ -470,7 +470,7 @@ def get_route_names(rows):
 def get_children(rows):
-    log.debug(f"Children: {rows}")
+    # log.debug(f"Children: {rows}")
    return [dict(
        order_id=r.order_id,
        id=r.id,
@@ -490,7 +490,7 @@ def get_module_menus(module):
                Route.parent_id == None)
    result = get_children(query.order_by(Route.order_id))
-    log.debug(result)
+    # log.debug(result)
    return result

--- a/opensipkd/base/scripts/data/routes.csv
+++ b/opensipkd/base/scripts/data/routes.csv
 kode,path,nama,status,type,app_id
 home,/,Home,1,0,
 home-auth,/home,Home Auth,1,
-home-about,/home/{id}/about,Home About,
+home-about,/home/{id}/about,Home About,1
 login,/login,Login,1,0,
 logout,/logout,Logout,1,0,
 rpc,/rpc,RPC,1,1,
-change-password,/password/{code},Ubah password,0,
+change-password,/password/{code},Ubah password,1,
-password,/password,Ubah password,0,
+password,/password,Ubah password,1,
-reset-password,/reset-password,0,
+reset-password,/reset-password,0,1
-reset-password-sent,/reset-password-sent,0,
+reset-password-sent,/reset-password-sent,0,1
-menu,/menu,Menus,0,
+menu,/menu,Menus,1,
-menu-act,/menu/{act}/act,Menus Act,0,
+menu-act,/menu/{act}/act,Menus Act,1,
-menu-add,/menu/add,Menus Add,0,
+menu-add,/menu/add,Menus Add,1,
-menu-edit,/menu/{id}/edit,Menus Edit,0,
+menu-edit,/menu/{id}/edit,Menus Edit,1,
-menu-delete,/menu/{id}/delete,Menus Delete,0,
+menu-delete,/menu/{id}/delete,Menus Delete,1,
-menu-view,/menu/{id}/view,Menus View,0,
+menu-view,/menu/{id}/view,Menus View,1,
-user,/user,Daftar User,
+user,/user,Daftar User,1
-user-add,/user/add,Tambah User,
+user-add,/user/add,Tambah User,1
-user-edit,/user/{id}/edit,Edit User,
+user-edit,/user/{id}/edit,Edit User,1
-user-view,/user/{id}/view,View User,
+user-view,/user/{id}/view,View User,1
-user-delete,/user/{id}/delete,Hapus User,
+user-delete,/user/{id}/delete,Hapus User,1
-user-act,/user/{act}/act,Act User,
+user-act,/user/{act}/act,Act User,1
-user-ext,/user/ext,Daftar User Ext,
+user-ext,/user/ext,Daftar User Ext,1
 user-ext-add,/user/ext/add,Tambah User Ext,
 user-ext-edit,/user/ext/{id}/edit,Edit User Ext,
 user-ext-view,/user/ext/{id}/view,View User Ext,
@@ -94,19 +94,19 @@ departemen-user-edt,/departemen/user/{id}/edt,User Organisasi Edit,1,0,
 departemen-user-view,/departemen/user/{id}/view,User Organisasi view,1,0,
 departemen-user-del,/departemen/user/{id}/del,User Organisasi Hapus,1,0,
 departemen-user-rpt,/departemen/user/{rpt}/rpt,User Organisasi Report,1,0,
-rpc-user,/rpc/user,WebService User Management,,1,
+rpc-user,/rpc/user,WebService User Management,1,1,
-recreate-api-key,/recreate-api-key,Buat ulang API Key,0,
+recreate-api-key,/recreate-api-key,Buat ulang API Key,1,
-googleOauth2,/googleOauth2,'Google OAuth2',
+googleOauth2,/googleOauth2,'Google OAuth2',1
-googleOauth2,/googleOauth2,'Google OAuth2',
+googleOauth2,/googleOauth2,'Google OAuth2',1
-googlesignin,/googlesignin, "Google SignIn",
+googlesignin,/googlesignin, "Google SignIn",1
-permission,/permission,Daftar Permission,
+permission,/permission,Daftar Permission,1
-permission-add,/permission/add,Tambah Permission,
+permission-add,/permission/add,Tambah Permission,1
-permission-edit,/permission/{id}/edit,Edit Permission,
+permission-edit,/permission/{id}/edit,Edit Permission,1
-permission-view,/permission/{id}/view,Permission view,
+permission-view,/permission/{id}/view,Permission view,1
-permission-delete,/permission/{id}/delete,Hapus Permission,
+permission-delete,/permission/{id}/delete,Hapus Permission,1
-permission-act,/permission/{act}/act,Act Permission,
+permission-act,/permission/{act}/act,Act Permission,1
-eselon,/eselon,Daftar Eselon,
+eselon,/eselon,Daftar Eselon,1
-eselon-add,/eselon/add,Tambah Eselon,
+eselon-add,/eselon/add,Tambah Eselon,1
 eselon-edit,/eselon/{id}/edit,Edit Eselon,
 eselon-view,/eselon/{id}/view,View Eselon,
 eselon-delete,/eselon/{id}/delete,Hapus Eselon,

--- a/opensipkd/base/views/base_views.py
+++ b/opensipkd/base/views/base_views.py
@@ -224,6 +224,7 @@ class BaseView(object):
    def view_list(self, **kwargs):
        if self.list_schema:
+            allow_view = kwargs.get("allow_view", True)
            allow_edit = kwargs.get("allow_edit", True)
            allow_delete = kwargs.get("allow_delete", True)
            allow_post = kwargs.get("allow_post", False)
@@ -243,6 +244,7 @@ class BaseView(object):
                            action_suffix="/grid/act",
                            buttons=self.list_buttons,
                            request=self.req,
+                            allow_view=allow_view,
                            allow_edit=allow_edit,
                            allow_delete=allow_delete,
                            allow_post=allow_post,

--- a/opensipkd/base/views/routes.py
+++ b/opensipkd/base/views/routes.py
@@ -209,11 +209,11 @@ class Views(BaseView):
            term = 'term' in params and params['term'] or ''
            q = Route.query(). \
                filter(Route.status == 1,
-                       Route.nama.ilike('%%%s%%' % term)) \
+                       Route.kode.ilike('%%%s%%' % term)) \
-                .order_by(Route.nama)
+                .order_by(Route.kode)
            r = []
            for k in q.all():
-                d = dict(id=k.id, value=k.nama, kode=k.kode, nama=k.nama)
+                d = dict(id=k.id, value=k.kode, kode=k.kode, nama=k.nama)
                r.append(d)
            return r
@@ -224,7 +224,7 @@ class Views(BaseView):
        values = super().get_values(row, istime, null)
        if row.parent_id:
            route = Route.query_id(row.parent_id).first()
-            values["parent_nm"] = route and route.nama or ""
+            values["parent_nm"] = route and route.kode or ""
        _logging.debug(values)
        return values

--- a/opensipkd/models/users.py
+++ b/opensipkd/models/users.py
@@ -206,7 +206,7 @@ class ExternalIdentity(ExternalIdentityMixin, CommonModel, Base):
 class Permission(Base, CommonModel):
    __tablename__ = 'permissions'
-    __table_args__ = {'extend_existing': True, }
+    __table_args__ = (TABLE_ARGS)
    id = Column(Integer, primary_key=True)
    perm_name = Column(String(64), nullable=False, unique=True)
    description = Column(String(64), nullable=False, unique=True)