Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-11-22 15:32:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

bugfix registration for directory server

Browse source
This commit is contained in:
Edip YILDIZ 2020-07-23 16:35:04 +03:00
parent cd2fdc6608
commit 07a6661a09
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/base/agreement/ahenkmessage.py
View file

@ -31,11 +31,12 @@ class AskRegister():
tk.Label(self.master, text="* Yetkili Kullanıcı : ").grid(row=1) tk.Label(self.master, text="* Yetkili Kullanıcı : ").grid(row=1)
tk.Label(self.master, text="* Parola : ").grid(row=2) tk.Label(self.master, text="* Parola : ").grid(row=2)
tk.Label(self.master, textvariable= self.text, fg="red").grid(row=3,columnspan=2)
self.e2 = tk.Entry(self.master) self.e2 = tk.Entry(self.master)
self.e3 = tk.Entry(show="*") self.e3 = tk.Entry(show="*")
tk.Label(self.master, textvariable=self.text, fg="red").grid(row=3, columnspan=2)
# self.var1 = IntVar() # self.var1 = IntVar()
# Checkbutton(self.master, text="Active Directory", variable=self.var1, command=self.check1).grid(row=3, column=0, stick=tk.W, # Checkbutton(self.master, text="Active Directory", variable=self.var1, command=self.check1).grid(row=3, column=0, stick=tk.W,
# pady=4) # pady=4)

5
src/base/execution/execution_manager.py
View file

@ -405,6 +405,7 @@ class ExecutionManager(object):
def unregister(self, msg): def unregister(self, msg):
j = json.loads(msg) j = json.loads(msg)
status = str(j['status']).lower() status = str(j['status']).lower()
directory_server = str(j['directoryServer'])
# user_name = self.db_service.select_one_result('session', 'username', " 1=1 order by id desc ") # user_name = self.db_service.select_one_result('session', 'username', " 1=1 order by id desc ")
# display = self.db_service.select_one_result('session', 'display', " 1=1 order by id desc ") # display = self.db_service.select_one_result('session', 'display', " 1=1 order by id desc ")
if 'not_authorized' == str(status): if 'not_authorized' == str(status):
@ -428,10 +429,10 @@ class ExecutionManager(object):
"Değişikliklerin etkili olması için sistem yeniden başlatılacaktır. Lütfen bekleyiniz...", "Değişikliklerin etkili olması için sistem yeniden başlatılacaktır. Lütfen bekleyiniz...",
""): ""):
registration = Scope.get_instance().get_registration() registration = Scope.get_instance().get_registration()
registration.purge_and_unregister() registration.purge_and_unregister(directory_server)
else: else:
registration = Scope.get_instance().get_registration() registration = Scope.get_instance().get_registration()
registration.purge_and_unregister() registration.purge_and_unregister(directory_server)
def json_to_task_bean(self, json_data, file_server_conf=None): def json_to_task_bean(self, json_data, file_server_conf=None):

8
src/base/registration/registration.py
View file

@ -68,10 +68,10 @@ class Registration:
self.host = self.conf_manager.get("CONNECTION", "host") self.host = self.conf_manager.get("CONNECTION", "host")
user_name= os.getlogin() user_name= os.getlogin()
self.logger.debug('User : '+ str(user_name)) self.logger.info('User : '+ str(user_name))
pout = Util.show_registration_message(user_name,'Makineyi Lider MYS sistemine kaydetmek için bilgileri ilgili alanlara giriniz. LÜTFEN DEVAM EDEN İŞLEMLERİ SONLANDIRDIĞINZA EMİN OLUNUZ !', pout = Util.show_registration_message(user_name,'Makineyi Lider MYS sistemine kaydetmek için bilgileri ilgili alanlara giriniz. LÜTFEN DEVAM EDEN İŞLEMLERİ SONLANDIRDIĞINZA EMİN OLUNUZ !',
'LIDER MYS SISTEMINE KAYIT', self.host) 'LIDER MYS SISTEMINE KAYIT', self.host)
self.logger.debug('pout : ' + str(pout)) self.logger.info('pout : ' + str(pout))
field_values = pout.split(' ') field_values = pout.split(' ')
user_registration_info = list(field_values) user_registration_info = list(field_values)
@ -82,8 +82,8 @@ class Registration:
# self.directory_server = user_registration_info[3] # self.directory_server = user_registration_info[3]
else: else:
self.user_name = user_registration_info[0] self.user_name = user_registration_info[1]
self.user_password = user_registration_info[1] self.user_password = user_registration_info[2]
# self.directory_server = user_registration_info[2] # self.directory_server = user_registration_info[2]
#anon_messenger = AnonymousMessenger(self.message_manager.registration_msg(user_name,user_password), self.host,self.servicename) #anon_messenger = AnonymousMessenger(self.message_manager.registration_msg(user_name,user_password), self.host,self.servicename)