From 97185791165c6d2440f47938c9f14f56ad61857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Fri, 12 Jul 2024 19:59:50 +0300 Subject: [PATCH 1/2] Update github action file --- .github/workflows/cyber-project.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml index c2c3ae154..6e7b79a04 100644 --- a/.github/workflows/cyber-project.yml +++ b/.github/workflows/cyber-project.yml @@ -56,7 +56,7 @@ jobs: sudo chmod +x ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh sudo ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_PROJECT_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} - + deploy_preprod_server: name: Deploy to Preprod runs-on: app-sever-project-runner @@ -66,8 +66,8 @@ jobs: run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} + sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/} deploy_test_server: name: Deploy to Test @@ -77,5 +77,5 @@ jobs: - name: Checkout And Restart Project run: | echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}" - sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh - sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} + sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh + sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/} From 83331326c23e2abb57c9829c114b385e128012fd Mon Sep 17 00:00:00 2001 From: odex Date: Sun, 14 Jul 2024 10:26:04 +0300 Subject: [PATCH 2/2] [FIX] fix some bug api --- .../odex_mobile/controllers/rest_api_v2/leave.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py index af108c8ed..be9a3d805 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py @@ -40,8 +40,8 @@ class LeaveController(http.Controller): 'type_value': hol.holiday_status_id.id, 'reason_msg': hol.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, + 'replacement_id': hol.sudo().replace_by.id if hol.replace_by else False, + 'replacement_name': hol.sudo().replace_by.name if hol.replace_by else False, 'start_date': str(hol.date_from), 'end_date': str(hol.date_to), 'attachment': self.get_attchment(hol), 'reason': hol.name, 'state': validator.get_state_name(hol, hol.state), 'state_name': hol.state, 'employee_id': hol.employee_id.id, 'employee_name': hol.employee_id.name, @@ -103,7 +103,7 @@ class LeaveController(http.Controller): holidays = http.request.env['hr.holidays'].search( [('employee_id', '=', employee.id), ('type', '=', 'remove')], offset=offset, limit=limit) count = http.request.env['hr.holidays'].search_count( - [('employee_id', '=', employee.id), ('type', '=', 'remove')], ) + [('employee_id', '=', employee.id), ('type', '=', 'remove')],) ticket_cash_type = http.request.env['hr.ticket.request.type'].search([]) ticket_cash = [] if ticket_cash_type: @@ -174,7 +174,6 @@ class LeaveController(http.Controller): data = None try: holidays = http.request.env['hr.holidays'].sudo().search([('id', '=', id)]) - print(holidays) if holidays: data = self.get_return_data(holidays) @@ -271,9 +270,6 @@ class LeaveController(http.Controller): success=False) try: holidays = http.request.env['hr.holidays'].search([('id', '=', int(id))]) - print(holidays, id) - - if holidays: days = holidays._get_number_of_days(body['start_date'], body['end_date'], employee) vals = {