perbaikan users

opensipkd/base/models/users.py

@@ -93,6 +93,7 @@ class UserResourcePermission(_UserResourcePermission, Base):
 
 
 
 
 class _User(UserMixin, BaseModel):
 class _User(UserMixin, BaseModel):
+    db_session = DBSession
     last_login_date = Column(DateTime(timezone=True), nullable=True)
     last_login_date = Column(DateTime(timezone=True), nullable=True)
     registered_date = Column(DateTime(timezone=True),
     registered_date = Column(DateTime(timezone=True),
                              nullable=False,
                              nullable=False,
@@ -118,7 +119,7 @@ class _User(UserMixin, BaseModel):
     password = property(_get_password, _set_password)
     password = property(_get_password, _set_password)
 
 
     def get_groups(self):
     def get_groups(self):
-        return UserGroup.get_by_user(self)
+        return self.user_group.get_by_user(self)
 
 
     def last_login_date_tz(self):
     def last_login_date_tz(self):
         return as_timezone(self.last_login_date)
         return as_timezone(self.last_login_date)
@@ -233,6 +234,7 @@ class _ExternalIdentity(ExternalIdentityMixin):
 
 
     # ,
     # ,
     # overlaps = "external_identities,owner"
     # overlaps = "external_identities,owner"
+    db_session = DBSession
 
 
     @classmethod
     @classmethod
     def query(cls):
     def query(cls):

opensipkd/base/tools/report.py

@@ -39,7 +39,7 @@ def jasper_db_conn(db_schema=None, dburl="sqlalchemy.url"):
     jdbc_dir = get_params("jdbc_dir", "")
     jdbc_dir = get_params("jdbc_dir", "")
     jdbc_driver = db_driver_port[db_driver][2]
     jdbc_driver = db_driver_port[db_driver][2]
     db_driver = db_driver_port[db_driver][0]
     db_driver = db_driver_port[db_driver][0]
-    log.debug(jdbc_dir)
+    log.debug('JDBCDir: %s', jdbc_dir)
     return {
     return {
         'driver': db_driver,
         'driver': db_driver,
         'username': db_user.strip('/'),
         'username': db_user.strip('/'),

opensipkd/base/views/base_views.py

@@ -1007,9 +1007,6 @@ class BaseView(object):
     def get_values(self, row, istime=False, null=False):
     def get_values(self, row, istime=False, null=False):
         d = dict(row.__dict__)
         d = dict(row.__dict__)
         d.pop('_sa_instance_state', None)
         d.pop('_sa_instance_state', None)
-        # d = row.to_dict(null=null)
-        # if 'tanggal' in d and d['tanggal']:
-        #     d["tanggal"] = dmy(row.tanggal)
         values = {}
         values = {}
         for f in d:
         for f in d:
             if type(d[f]) is str:
             if type(d[f]) is str: