devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from expsa/fix_api_web 

fix
This commit is contained in:
AbuzarExp 2024-07-08 15:04:48 +03:00 committed by GitHub
parent 09125a3529 04d6d16138
commit a163e0c525
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_mobile/odex_mobile/controllers/leave.py
View File

@ -18,10 +18,10 @@ _logger = logging.getLogger(__name__)
import re
class LeaveController(http.Controller):
def get_return_data(self,hol,approvel=None):
value = {'id': hol.id, 'type': hol.holiday_status_id.name,
'type_value': hol.holiday_status_id.id,
'reason_msg': hol.reject_reason or "",
'alternative_chick': hol.holiday_status_id.alternative_chick,
'replacement_id': hol.replace_by.id if hol.replace_by else False,
'replacement_name': hol.replace_by.name if hol.replace_by else False,

1
odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
View File

@ -38,6 +38,7 @@ class LeaveController(http.Controller):
value = {'id': hol.id,
'type': hol.holiday_status_id.name,
'type_value': hol.holiday_status_id.id,
'reason_msg': hol.reject_reason or "",
'alternative_chick': hol.holiday_status_id.alternative_chick,
'replacement_id': hol.replace_by.id if hol.replace_by else False,
'replacement_name': hol.replace_by.name if hol.replace_by else False,