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

Syncing /usr/share/ahenk to src and recreating ahenk.install

Browse source
This commit is contained in:
Tuncay ÇOLAK 2020-06-29 11:25:36 +03:00
parent 059d85d2bf
commit 41eca527a8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/share/ahenk/base/command/command_runner.py
View file

@ -184,7 +184,7 @@ class CommandRunner(object):
elif str(json_data['event']) == 'unregister' and len(json_data)==1: elif str(json_data['event']) == 'unregister' and len(json_data)==1:
self.logger.info('Unregistering..') self.logger.info('Unregistering..')
self.execute_manager.set_unregister_credential_params(None, None) self.execute_manager.set_unregister_credential_params(None, None)
unregister_message = self.message_manager.unregister_msg() unregister_message = self.message_manager.unregister_msg(None,None)
if unregister_message is not None: if unregister_message is not None:
self.messenger.send_direct_message(unregister_message) self.messenger.send_direct_message(unregister_message)

8
usr/share/ahenk/base/messaging/messaging.py
View file

@ -171,10 +171,10 @@ class Messaging(object):
data['password'] = str(self.conf_manager.get('CONNECTION', 'password')) data['password'] = str(self.conf_manager.get('CONNECTION', 'password'))
# unregistration from commandline.. # unregistration from commandline..
if(usernameForCheck==None and passwordForCheck==None): if(usernameForCheck==None and passwordForCheck==None):
#user_name = self.db_service.select_one_result('session', 'username') user_name = self.db_service.select_one_result('session', 'username')
#display = self.db_service.select_one_result('session', 'display') display = self.db_service.select_one_result('session', 'display')
user_name = os.getlogin() #user_name = os.getlogin()
display = Util.get_username_display() #display = Util.get_username_display()
self.logger.debug('User : ' + str(user_name)) self.logger.debug('User : ' + str(user_name))
pout = Util.show_unregistration_message(user_name,display, pout = Util.show_unregistration_message(user_name,display,
'Makineyi etki alanından çıkarmak için zorunlu alanları giriniz. Lütfen DEVAM EDEN İŞLEMLERİNİZİ sonlandırdığınıza emin olunuz !', 'Makineyi etki alanından çıkarmak için zorunlu alanları giriniz. Lütfen DEVAM EDEN İŞLEMLERİNİZİ sonlandırdığınıza emin olunuz !',