Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit 50ea681f by aa.gusti
Options

eselon

1 parent 07a9c8c8
Inline Side-by-side
Showing 3 changed files with 17 additions and 13 deletions
opensipkd/base/__init__.py
...@@ -417,7 +417,7 @@ def get_urls(url): ...@@ -417,7 +417,7 @@ def get_urls(url):
if home: if home:
urls = url.split(":") urls = url.split(":")
homes = home.split(":") homes = home.split(":")
if len(urls) > 0: if len(urls) > 1:
if urls[0] != homes[0]: if urls[0] != homes[0]:
return ":".join([homes[0], ":".join(urls[1:])]) return ":".join([homes[0], ":".join(urls[1:])])
else: else:
......
opensipkd/base/scripts/initializedb.py
...@@ -85,16 +85,17 @@ def usage(argv): ...@@ -85,16 +85,17 @@ def usage(argv):
def create_schema(engine, schema): def create_schema(engine, schema):
sql = select(text('schema_name')).select_from( # sql = select(text('schema_name')).select_from(
text('information_schema.schemata')).where( # text('information_schema.schemata')).where(
text("schema_name = '%s'" % schema)) # text("schema_name = '%s'" % schema))
if isinstance(engine.dialect, oracle.dialect): # if isinstance(engine.dialect, oracle.dialect):
sql = select(['owner']).select_from('dba_segments').where( # sql = select(['owner']).select_from('dba_segments').where(
"owner = '%s'" % schema.upper()) # "owner = '%s'" % schema.upper())
# log.debug(sql)
with engine.connect() as conn: with engine.connect() as conn:
q = conn.execute(sql) sql = CreateSchema(schema, if_not_exists=True)
if not q.fetchone(): log.debug(f"Execute: {sql}")
conn.execute(CreateSchema(schema)) conn.execute(sql)
def read_file(filename): def read_file(filename):
......
opensipkd/base/views/eselon.py
...@@ -6,7 +6,6 @@ from pyramid.view import ( ...@@ -6,7 +6,6 @@ from pyramid.view import (
view_config, view_config,
) )
from .partner_base import NamaSchema
from opensipkd.models import ( from opensipkd.models import (
DBSession, DBSession,
Eselon Eselon
...@@ -27,6 +26,7 @@ class AddSchema(colander.Schema): ...@@ -27,6 +26,7 @@ class AddSchema(colander.Schema):
oid="nama") oid="nama")
status = colander.SchemaNode( status = colander.SchemaNode(
colander.Boolean(), colander.Boolean(),
widget=widget.CheckboxWidget(true_val=1, false_val=0),
oid="status") oid="status")
...@@ -35,8 +35,9 @@ class EditSchema(AddSchema): ...@@ -35,8 +35,9 @@ class EditSchema(AddSchema):
missing=colander.drop, missing=colander.drop,
widget=widget.HiddenWidget()) widget=widget.HiddenWidget())
class ListSchema(colander.Schema): class ListSchema(colander.Schema):
id = colander.SchemaNode(colander.String(),title="Action") id = colander.SchemaNode(colander.String(), title="Action")
kode = colander.SchemaNode( kode = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=32), validator=colander.Length(max=32),
...@@ -48,10 +49,11 @@ class ListSchema(colander.Schema): ...@@ -48,10 +49,11 @@ class ListSchema(colander.Schema):
validator=colander.Length(max=64), validator=colander.Length(max=64),
oid="nama") oid="nama")
status = colander.SchemaNode( status = colander.SchemaNode(
colander.Integer(), colander.Boolean(),
widget=widget.CheckboxWidget(), widget=widget.CheckboxWidget(),
oid="status") oid="status")
class Views(BaseView): class Views(BaseView):
def __init__(self, request): def __init__(self, request):
super(Views, self).__init__(request) super(Views, self).__init__(request)
...@@ -112,6 +114,7 @@ class Views(BaseView): ...@@ -112,6 +114,7 @@ class Views(BaseView):
permission='eselon') permission='eselon')
def view_add(self): def view_add(self):
return super().view_add() return super().view_add()
@view_config(route_name='eselon-edit', renderer='templates/form.pt', @view_config(route_name='eselon-edit', renderer='templates/form.pt',
permission='eselon') permission='eselon')
def view_edit(self): def view_edit(self):
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!