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

opensipkd/base/views/partner.py

@@ -17,6 +17,7 @@ from opensipkd.tools.buttons import btn_save, btn_cancel, btn_delete
 
 
 from ..models import DBSession
 from ..models import DBSession
 from ..models import Partner
 from ..models import Partner
+from ..models.partner import PartnerUserModel
 from ..views import ColumnDT, DataTables, BaseView
 from ..views import ColumnDT, DataTables, BaseView
 
 
 SESS_ADD_FAILED = 'Tambah partner gagal'
 SESS_ADD_FAILED = 'Tambah partner gagal'
@@ -266,6 +267,10 @@ class ViewPartner(BaseView):
         form = get_form(request, EditSchema, buttons=(btn_delete, btn_cancel,))
         form = get_form(request, EditSchema, buttons=(btn_delete, btn_cancel,))
         if request.POST:
         if request.POST:
             if 'delete' in request.POST:
             if 'delete' in request.POST:
+                partner_user = DBSession.query(PartnerUserModel). \
+                    filter_by(partner_id=request.matchdict['id'])
+                if partner_user.first():
+                    partner_user.delete()
                 msg = 'Partner ID %d %s sudah dihapus.' % (row.id, row.nama)
                 msg = 'Partner ID %d %s sudah dihapus.' % (row.id, row.nama)
                 q.delete()
                 q.delete()
                 DBSession.flush()
                 DBSession.flush()

opensipkd/base/views/user_rpc.py

@@ -189,7 +189,7 @@ def register_user_(data, user, groups=None):
                     row = save_groups(data, None)
                     row = save_groups(data, None)
                     ret_groups.append(dict(group_name=group))
                     ret_groups.append(dict(group_name=group))
                     del data['group_id']
                     del data['group_id']
-                    del data['user_id']
+                    # del data['user_id']
             data['groups']=ret_groups
             data['groups']=ret_groups
         result.append(data)
         result.append(data)