Skip to content

aa.gusti / opensipkd-base

Go to a project
Commit b1244f93 by aa.gustiana@gmail.com
Options

Update Users Add Edit Delet

1 parent 8b4c615b
Inline Side-by-side
Showing 1 changed file with 59 additions and 97 deletions
opensipkd/base/views/user.py
...@@ -70,14 +70,6 @@ class Views(BaseView): ...@@ -70,14 +70,6 @@ class Views(BaseView):
user=row) user=row)
# company_list=ResCompany.get_list()) # company_list=ResCompany.get_list())
# @view_config(
# route_name='user', renderer='templates/table.pt',
# permission='user-view')
# def view_list(self):
# return super(Views, self).view_list()
# @view_config(
# route_name='user-act', renderer='json', permission='user-view')
# def view_act(self): # def view_act(self):
# url_dict = self.req.matchdict # url_dict = self.req.matchdict
# if url_dict['act'] == 'csv': # if url_dict['act'] == 'csv':
...@@ -118,91 +110,61 @@ class Views(BaseView): ...@@ -118,91 +110,61 @@ class Views(BaseView):
# if "company_id" in value and not value["company_id"]: # if "company_id" in value and not value["company_id"]:
# value["company_id"] = None # value["company_id"] = None
# def save_request(self, values, row=None): def save_request(self, values, row=None):
# request = self.req request = self.req
# values["email"] = values['email'].lower() values["email"] = values['email'].lower()
# values["user_name"] = re.sub(' ', '', values['user_name']) # .lower() values["user_name"] = re.sub(' ', '', values['user_name']) # .lower()
# values["security_code_date"] = create_now() values["security_code_date"] = create_now()
# # company_id = request.user and request.user.company_id or "company_id" in values and \ # company_id = request.user and request.user.company_id or "company_id" in values and \
# # values["company_id"] or None # values["company_id"] or None
# # values["company_id"] = company_id # values["company_id"] = company_id
# if "company_id" not in values: # if "company_id" not in values:
# values["company_id"] = None # values["company_id"] = None
# if 'is_api_key' in values: if 'is_api_key' in values:
# values["api_key"] = generate_api_key() values["api_key"] = generate_api_key()
# insert = not row insert = not row
# row = self.save(values, self.req.user, row) row = self.save(values, self.req.user, row)
# if insert: if insert:
# remain = regenerate_security_code(row) remain = regenerate_security_code(row)
# if 'password' in values: if 'password' in values:
# data = dict(username=row.user_name) data = dict(username=row.user_name)
# ts = _( ts = _(
# 'user-added-with-password', 'user-added-with-password',
# default='${username} berhasil ditambahkan.', mapping=data) default='${username} berhasil ditambahkan.', mapping=data)
# else: else:
# send_email_security_code( send_email_security_code(
# self.req, row, remain, 'Welcome new user', 'email-new-user', self.req, row, remain, 'Welcome new user', 'email-new-user',
# 'email-new-user.tpl') 'email-new-user.tpl')
# data = dict(email=row.email) data = dict(email=row.email)
# ts = _( ts = _(
# 'user-added', 'user-added',
# default='${email} berhasil ditambahkan dan email untuk ubah ' default='${email} berhasil ditambahkan dan email untuk ubah '
# 'kata kunci sudah dikirim.', 'kata kunci sudah dikirim.',
# mapping=data) mapping=data)
# self.ses.flash(ts) self.ses.flash(ts)
# if 'password' in values: if 'password' in values:
# UserService.set_password(row, values['password']) UserService.set_password(row, values['password'])
# DBSession.add(row) DBSession.add(row)
# DBSession.flush() DBSession.flush()
# existing = user_group_set(row) existing = user_group_set(row)
# unused = existing - values['groups'] unused = existing - values['groups']
# if unused: if unused:
# q = DBSession.query(UserGroup).filter_by(user_id=row.id).filter( q = DBSession.query(UserGroup).filter_by(user_id=row.id).filter(
# UserGroup.group_id.in_(unused)) UserGroup.group_id.in_(unused))
# q.delete(synchronize_session=False) q.delete(synchronize_session=False)
# for gid in unused: for gid in unused:
# reduce_member_count(gid) reduce_member_count(gid)
# new = values['groups'] - existing new = values['groups'] - existing
# for gid in new: for gid in new:
# ug = UserGroup() ug = UserGroup()
# ug.user_id = row.id ug.user_id = row.id
# ug.group_id = gid ug.group_id = gid
# DBSession.add(ug) DBSession.add(ug)
# add_member_count(gid) add_member_count(gid)
# return row return row
# @view_config(
# route_name='user-add', renderer='templates/form.pt',
# permission='user-view')
# def view_add(self):
# return super(Views, self).view_add()
# # user, remain = insert(request, values)
# def get_values(self, row, istime=False):
# d = super(Views, self).get_values(row, istime)
# d["groups"] = user_group_set(row)
# return d
# @view_config(
# route_name='user-edit', renderer='templates/form.pt',
# permission='user-edit')
# def view_edit(self):
# return super(Views, self).view_edit()
# @view_config(
# route_name='user-view', renderer='templates/form.pt',
# permission='user-view')
# def view_view(self):
# return super(Views, self).view_view()
# @view_config(
# route_name='user-delete', renderer='templates/form.pt',
# permission='user-edit')
# def view_delete(self):
# return super(Views, self).view_delete()
# def delete_msg(self, row): # def delete_msg(self, row):
# data = dict(uid=row.id, email=row.email) # data = dict(uid=row.id, email=row.email)
...@@ -211,10 +173,10 @@ class Views(BaseView): ...@@ -211,10 +173,10 @@ class Views(BaseView):
# default='User ${email} ID ${uid} has been deleted', # default='User ${email} ID ${uid} has been deleted',
# mapping=data) # mapping=data)
# def before_delete(self, row): def before_delete(self, row):
# gid_list = user_group_set(row) gid_list = user_group_set(row)
# for gid in gid_list: for gid in gid_list:
# reduce_member_count(gid) reduce_member_count(gid)
# def query_id(self): # def query_id(self):
# q = DBSession.query(User).filter_by(id=self.req.matchdict['id']) # q = DBSession.query(User).filter_by(id=self.req.matchdict['id'])
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!