From 32b34ca9b934f306f836b587d6abdd7399e465d0 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 12:33:33 -0800 Subject: [PATCH 1/3] departmentNameLinkFormatter had a bad url --- .env.testing.example | 19 ----------------- .github/workflows/crowdin-upload.yml | 21 ------------------- .../views/partials/bootstrap-table.blade.php | 2 +- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 .env.testing.example delete mode 100644 .github/workflows/crowdin-upload.yml diff --git a/.env.testing.example b/.env.testing.example deleted file mode 100644 index 3391d627261..00000000000 --- a/.env.testing.example +++ /dev/null @@ -1,19 +0,0 @@ -# -------------------------------------------- -# REQUIRED: BASIC APP SETTINGS -# -------------------------------------------- -APP_ENV=testing -APP_DEBUG=true -APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU= -APP_URL=http://localhost:8000 -APP_TIMEZONE='UTC' -APP_LOCALE=en - -# -------------------------------------------- -# REQUIRED: DATABASE SETTINGS -# -------------------------------------------- -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=null -DB_USERNAME=null -DB_PASSWORD=null diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml deleted file mode 100644 index 3255934534b..00000000000 --- a/.github/workflows/crowdin-upload.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Crowdin Action - -on: - push: - branches: [ develop ] - -jobs: - upload-sources-to-crowdin: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Crowdin push - uses: crowdin/github-action@v1 - with: - upload_sources: true - upload_translations: false - download_translations: false - project_id: ${{ secrets.CROWDIN_PROJECT_ID }} - token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 74abfa24b2a..20c52d5b22a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -597,7 +597,7 @@ function assetTagLinkFormatter(value, row) { function departmentNameLinkFormatter(value, row) { if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) { - return '' + row.assigned_user.department.name + ''; + return '' + row.assigned_user.department.name + ''; } } From 1f1e58eb1e1ce5f56e17fb1c617ace8a6c92ca94 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 12:36:57 -0800 Subject: [PATCH 2/3] remove unintentional change --- .env.testing.example | 19 +++++++++++++++++ .github/workflows/crowdin-upload.yml | 21 +++++++++++++++++++ .../views/partials/bootstrap-table.blade.php | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .env.testing.example create mode 100644 .github/workflows/crowdin-upload.yml diff --git a/.env.testing.example b/.env.testing.example new file mode 100644 index 00000000000..3391d627261 --- /dev/null +++ b/.env.testing.example @@ -0,0 +1,19 @@ +# -------------------------------------------- +# REQUIRED: BASIC APP SETTINGS +# -------------------------------------------- +APP_ENV=testing +APP_DEBUG=true +APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU= +APP_URL=http://localhost:8000 +APP_TIMEZONE='UTC' +APP_LOCALE=en + +# -------------------------------------------- +# REQUIRED: DATABASE SETTINGS +# -------------------------------------------- +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=null +DB_USERNAME=null +DB_PASSWORD=null diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml new file mode 100644 index 00000000000..3255934534b --- /dev/null +++ b/.github/workflows/crowdin-upload.yml @@ -0,0 +1,21 @@ +name: Crowdin Action + +on: + push: + branches: [ develop ] + +jobs: + upload-sources-to-crowdin: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Crowdin push + uses: crowdin/github-action@v1 + with: + upload_sources: true + upload_translations: false + download_translations: false + project_id: ${{ secrets.CROWDIN_PROJECT_ID }} + token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 20c52d5b22a..74abfa24b2a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -597,7 +597,7 @@ function assetTagLinkFormatter(value, row) { function departmentNameLinkFormatter(value, row) { if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) { - return '' + row.assigned_user.department.name + ''; + return '' + row.assigned_user.department.name + ''; } } From a110b5fccab22266ac992d6336fece5811ce77d5 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 4 Jan 2024 12:37:53 -0800 Subject: [PATCH 3/3] ugh --- resources/views/partials/bootstrap-table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 74abfa24b2a..20c52d5b22a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -597,7 +597,7 @@ function assetTagLinkFormatter(value, row) { function departmentNameLinkFormatter(value, row) { if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) { - return '' + row.assigned_user.department.name + ''; + return '' + row.assigned_user.department.name + ''; } }