aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

#111: Accessing the user activity page/JSON feed is now impossible when feeds are disabled. Also the Activity icon is not shown in the navbar when feeds are disabled.

Browse Source
This commit is contained in:
Andy Heathershaw 2018-11-17 16:02:31 +00:00
parent 3982f47243
commit 42a1e4b770
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Gallery/UserController.php
View File

@ -22,6 +22,11 @@ class UserController extends Controller
{ {
public function activityFeed() public function activityFeed()
{ {
if (!UserConfig::get('social_user_feeds'))
{
return redirect(route('home'));
}
return Theme::render('gallery.user_activity_feed', [ return Theme::render('gallery.user_activity_feed', [
'user' => $this->getUser() 'user' => $this->getUser()
]); ]);
@ -29,6 +34,11 @@ class UserController extends Controller
public function activityFeedJson() public function activityFeedJson()
{ {
if (!UserConfig::get('social_user_feeds'))
{
return response()->json(['message' => 'Activity feeds not enabled']);
}
$user = $this->getUser(); $user = $this->getUser();
$result = []; $result = [];

2
resources/views/themes/base/partials/navbar.blade.php
View File

@ -6,7 +6,7 @@
<div class="collapse navbar-collapse" id="navbar-content"> <div class="collapse navbar-collapse" id="navbar-content">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
@if (!Auth::guest()) @if (!Auth::guest() && UserConfig::get('social_user_feeds'))
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ route('userActivityFeed') }}"> <a class="nav-link" href="{{ route('userActivityFeed') }}">
<i class="fa fa-rss"></i> @lang('navigation.navbar.activity_feed') <i class="fa fa-rss"></i> @lang('navigation.navbar.activity_feed')