Commit bc223f84 by aa.gusti

perbaikan register user add group

1 parent 0d449543
......@@ -9,4 +9,5 @@ group_id/groups.group_name,perm_name
"Superuser","parameter"
"Superuser","permission"
"Web Service","web-service"
"Pindah Departemen","departemen-all"
\ No newline at end of file
"Pindah Departemen","departemen-all"
"Guest", "guest"
\ No newline at end of file
perm_name,description
admin,Administrator
guest,Guest
user-edit,User management
user-view,User view
user-group,User Group
......
......@@ -163,8 +163,7 @@ class BaseView(object):
def query_register(self, **kwargs):
pass
def delete_msg(self, row):
return f'Data ID {row.id} sudah dihapus.'
def route_list(self, **kwargs):
msg = kwargs.get("msg")
......@@ -664,6 +663,9 @@ class BaseView(object):
return self.returned_form(form, table, **kwargs)
def delete_msg(self, row):
return f'Data ID {row.id} sudah dihapus.'
def before_delete(self, row):
pass
......@@ -760,4 +762,4 @@ def need_verify():
def get_url_captcha(request):
captcha = get_captcha(request)
return os.path.join(get_urls(request.route_url('home')), 'captcha', captcha)
return os.path.join(get_urls(request.route_url('home')), 'captcha', captcha)
\ No newline at end of file
......@@ -290,6 +290,7 @@ class Registrasi(BaseView):
else:
value.pop("idcard")
value["groups"]="Guest"
def before_add(self):
result = {}
......@@ -381,21 +382,24 @@ class Registrasi(BaseView):
values["is_vendor"] = 0
values["is_customer"] = 1
row = super().save_request(values, row)
if not self.req.user: # User Baru
user = User()
user.email = row.email
user.user_name = row.email
user.registered_date = datetime.now()
DBSession.add(user)
DBSession.flush()
if 'groups' in values and values['groups']:
gr = Group.query_group_name(values['groups']).first()
ug = UserGroup()
ug.user_id = row.id
ug.user_id = user.id
ug.group_id = gr.id
DBSession.add(ug)
add_member_count(gr.id)
DBSession.flush()
user = User()
user.email = row.email
user.user_name = row.email
user.registered_date = datetime.now()
DBSession.add(user)
DBSession.flush()
remain = regenerate_security_code(user)
send_email_security_code(
self.req, user, remain, 'Welcome new user', 'email-new-user',
......@@ -423,4 +427,4 @@ class Registrasi(BaseView):
values = dict(c)
row = self.save_request(values)
self.after_add(row=row, values=values)
return self.route_list()
return self.route_list()
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!