Skip to content

Commit

Permalink
Merge branch '3.2' into 3
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
GuySartorelli committed Jun 20, 2024
2 parents 68230f0 + 6515659 commit 41985ea
Show file tree
Hide file tree
Showing 4 changed files with 477 additions and 858 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/add-prs-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Add new PRs to github project

on:
pull_request_target:
types:
- opened
- ready_for_review

permissions: {}

jobs:
addprtoproject:
name: Add PR to GitHub Project
# Only run on the silverstripe account
if: github.repository_owner == 'silverstripe'
runs-on: ubuntu-latest
steps:
- name: Add PR to github project
uses: silverstripe/gha-add-pr-to-project@v1
with:
app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"build": "yarn && yarn lint && rm -rf client/dist/* && NODE_ENV=production webpack --mode production --bail --progress",
"dev": "NODE_ENV=development webpack --progress",
"watch": "NODE_ENV=development webpack --watch --progress",
"lint": "eslint client/src/js && stylelint client/src/styles"
"lint": "eslint client/src/js && stylelint client/src"
},
"dependencies": {},
"devDependencies": {
"@silverstripe/eslint-config": "^1.2.1",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.1.0",
"webpack": "^5.74.0",
"webpack-cli": "^5.0.0"
Expand Down
8 changes: 4 additions & 4 deletions src/Model/BrokenExternalPageTrackStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class BrokenExternalPageTrackStatus extends DataObject implements i18nEntityProv
*/
public static function get_latest()
{
return self::get()
return BrokenExternalPageTrackStatus::get()
->sort('ID', 'DESC')
->first();
}
Expand Down Expand Up @@ -118,13 +118,13 @@ public function getCompletedPages()
public static function get_or_create()
{
// Check the current status
$status = self::get_latest();
$status = BrokenExternalPageTrackStatus::get_latest();
if ($status && $status->Status == 'Running') {
$status->updateStatus();
return $status;
}

return self::create_status();
return BrokenExternalPageTrackStatus::create_status();
}

/**
Expand All @@ -135,7 +135,7 @@ public static function get_or_create()
public static function create_status()
{
// If the script is to be started create a new status
$status = self::create();
$status = BrokenExternalPageTrackStatus::create();
$status->updateJobInfo('Creating new tracking object');

// Setup all pages to test
Expand Down
Loading

0 comments on commit 41985ea

Please sign in to comment.