tonyair/silverstripe-externallinks
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-externallinks.git synced 2024-10-22 15:05:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
This commit is contained in:
Robbie Averill 2019-03-11 15:39:46 +13:00
commit 5091bf91e5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/BrokenExternalLinksReport.js
View File

@ -53,6 +53,7 @@
// set button to "submitting" state
$button.addClass('btn--loading loading');
$button.attr('disabled', true);
if ($button.is('button')) {
$button.append($(
@ -75,6 +76,7 @@
var $button = this.getButton();
$button.removeClass('btn--loading loading');
$button.attr('disabled', false);
$button.find('.btn__loading-icon').remove();
$button.css('width', 'auto');
},
@ -89,7 +91,7 @@
success: function(data) {
// No report, so let user create one
if (!data) {
this.buttonReset();
self.buttonReset();
return;
}

2
src/Controllers/CMSExternalLinksController.php
View File

@ -36,7 +36,7 @@ class CMSExternalLinksController extends Controller
// Format status
$track = BrokenExternalPageTrackStatus::get_latest();
if ($track) {
return Convert::array2json([
return json_encode([
'TrackID' => $track->ID,
'Status' => $track->Status,
'Completed' => $track->getCompletedPages(),