Commit dda0e371 by Taufikyu

1. tambahkan nik sudah dipakai oleh username....

2. perbaiki widget blok kav no
1 parent c064fe8e
...@@ -182,7 +182,6 @@ class BaseView(object): ...@@ -182,7 +182,6 @@ class BaseView(object):
self.ses.flash(msg, error) self.ses.flash(msg, error)
if not list_url: if not list_url:
list_url = self.req.route_url(self.list_route) list_url = self.req.route_url(self.list_route)
log.error(list_url)
if self.headers: if self.headers:
return HTTPFound(location=get_urls(list_url), return HTTPFound(location=get_urls(list_url),
headers=self.headers) headers=self.headers)
......
...@@ -138,7 +138,9 @@ def email_found_partner(email): ...@@ -138,7 +138,9 @@ def email_found_partner(email):
def nik_found(nik): def nik_found(nik):
return Partner.query_kode(nik).first() # return Partner.query_kode(nik).first()
return (DBSession.query(Partner.id, User.user_name).
filter(Partner.kode==nik).first())
def _show_error(request, msg): def _show_error(request, msg):
...@@ -204,9 +206,9 @@ class Registrasi(BaseView): ...@@ -204,9 +206,9 @@ class Registrasi(BaseView):
msg = 'Email %s sudah ada yang menggunakan' % value['email'] msg = 'Email %s sudah ada yang menggunakan' % value['email']
raise_err('email', msg) raise_err('email', msg)
def err_nik(): def err_nik(username):
if "kode" in form: if "kode" in form:
msg = 'NIK %s sudah ada yang menggunakan' % value['kode'] msg = 'NIK {} sudah digunakan oleh username {}'.format(value['kode'], username)
raise_err('kode', msg) raise_err('kode', msg)
else: else:
...@@ -272,9 +274,9 @@ class Registrasi(BaseView): ...@@ -272,9 +274,9 @@ class Registrasi(BaseView):
found_nik = nik_found(value['kode']) found_nik = nik_found(value['kode'])
if partner: if partner:
if found_nik and found_nik.id != partner.id: if found_nik and found_nik.id != partner.id:
err_nik() err_nik(found_nik.user_name)
elif found_nik: elif found_nik:
err_nik() err_nik(found_nik.user_name)
if 'password' in value: if 'password' in value:
if not user or not UserService.check_password( if not user or not UserService.check_password(
......
...@@ -138,12 +138,15 @@ class BlokKavNoWidget(Widget): ...@@ -138,12 +138,15 @@ class BlokKavNoWidget(Widget):
) )
def serialize(self, field, cstruct, **kw): def serialize(self, field, cstruct, **kw):
if cstruct is null: if not cstruct or cstruct is null:
blok_kav_no = "" blok_kav_no = ""
rt = "000" rt = "000"
rw = "00" rw = "00"
else: else:
blok_kav_no, rt, rw = cstruct.split("|", 3) parts = cstruct.split("|", 3)
blok_kav_no = parts[0] if len(parts) > 0 else ""
rt = parts[1] if len(parts) > 1 else "000"
rw = parts[2] if len(parts) > 2 else "00"
kw.setdefault("blok_kav_no", blok_kav_no) kw.setdefault("blok_kav_no", blok_kav_no)
kw.setdefault("rt", rt) kw.setdefault("rt", rt)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!