webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

Added activity text for each activity type

Browse Source 
Ensures some sensible text is always in webhook text data.
Also aligned some notification reporting to use centralised activity
system instead of custom success events.

For #4216
This commit is contained in:
Dan Brown
2023-06-12 16:45:30 +01:00
parent af0b4fa851
commit f39938c4e3
12 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Entities/Controllers/ChapterController.php
View File

@@ -191,8 +191,6 @@ class ChapterController extends Controller
return redirect()->back();
}
$this->showSuccessNotification(trans('entities.chapter_move_success', ['bookName' => $newBook->name]));
return redirect($chapter->getUrl());
}

4
app/Entities/Controllers/PageController.php
View File

@@ -389,7 +389,7 @@ class PageController extends Controller
}
try {
$parent = $this->pageRepo->move($page, $entitySelection);
$this->pageRepo->move($page, $entitySelection);
} catch (PermissionsException $exception) {
$this->showPermissionError();
} catch (Exception $exception) {
@@ -398,8 +398,6 @@ class PageController extends Controller
return redirect()->back();
}
$this->showSuccessNotification(trans('entities.pages_move_success', ['parentName' => $parent->name]));
return redirect($page->getUrl());
}

9
app/Entities/Controllers/PageRevisionController.php
View File

@@ -15,11 +15,9 @@ use Ssddanbrown\HtmlDiff\Diff;
class PageRevisionController extends Controller
{
protected PageRepo $pageRepo;
public function __construct(PageRepo $pageRepo)
{
$this->pageRepo = $pageRepo;
public function __construct(
protected PageRepo $pageRepo
) {
}
/**
@@ -153,7 +151,6 @@ class PageRevisionController extends Controller
$revision->delete();
Activity::add(ActivityType::REVISION_DELETE, $revision);
$this->showSuccessNotification(trans('entities.revision_delete_success'));
return redirect($page->getUrl('/revisions'));
}

2
app/Entities/Controllers/RecycleBinController.php
View File

@@ -11,7 +11,7 @@ use BookStack\Http\Controller;
class RecycleBinController extends Controller
{
protected $recycleBinBaseUrl = '/settings/recycle-bin';
protected string $recycleBinBaseUrl = '/settings/recycle-bin';
/**
* On each request to a method of this controller check permissions