Merge branch 'master' of github.com:summerblue/phphub5

od3n · Aug 9, 2016 · 983fb60 · 983fb60
2 parents 37d1744 + f185671
commit 983fb60
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/Models/Model.php b/app/Models/Model.php
@@ -0,0 +1,10 @@
+<?php
+namespace App\Models;
+
+use Watson\Rememberable\Rememberable;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
+abstract class Model extends Eloquent
+{
+ use Rememberable;
+}
diff --git a/resources/views/topics/partials/replies.blade.php b/resources/views/topics/partials/replies.blade.php
@@ -37,7 +37,7 @@
  <span> ⋅ </span>
  @endif
 
- @if ($currentUser && ($currentUser->can("manage_topics") || $currentUser->id == $reply->user_id) )
+ @if ($currentUser && ($manage_topics || $currentUser->id == $reply->user_id) )
  <a id="reply-delete-{{ $reply->id }}" data-ajax="delete" href="javascript:void(0);" data-url="{{route('replies.destroy', [$reply->id])}}" title="{{lang('Delete')}}">
  <i class="fa fa-trash-o"></i>
  </a>

diff --git a/resources/views/topics/partials/topic_operate.blade.php b/resources/views/topics/partials/topic_operate.blade.php
@@ -6,7 +6,7 @@
 
  <div class="pull-right actions">
 
- @if ($currentUser && $currentUser->can("manage_topics") )
+ @if ($currentUser && $manage_topics )
  <a data-ajax="post" id="topic-recomend-button" href="javascript:void(0);" data-url="{{ route('topics.recommend', [$topic->id]) }}" class="admin {{ $topic->is_excellent == 'yes' ? 'active' : ''}}" title="{{ lang('Mark as Excellent') }}">
  <i class="fa fa-trophy"></i>
  </a>
@@ -28,7 +28,7 @@
  </a>
  @endif
 
- @if ( $currentUser && ($currentUser->can("manage_topics") || $currentUser->id == $topic->user_id) )
+ @if ( $currentUser && ($manage_topics || $currentUser->id == $topic->user_id) )
  <a id="topic-append-button" href="javascript:void(0);" title="{{ lang('Append') }}" class="admin" data-toggle="modal" data-target="#exampleModal">
  <i class="fa fa-plus"></i>
  </a>

diff --git a/resources/views/topics/show.blade.php b/resources/views/topics/show.blade.php
@@ -43,7 +43,7 @@
  @endforeach
  </div>
 
- @include('topics.partials.topic_operate')
+ @include('topics.partials.topic_operate', ['manage_topics' => $currentUser ? $currentUser->can("manage_topics") : false])
  </div>
 
 
@@ -104,7 +104,7 @@ class="vote btn btn-primary {{ $currentUser && $topic->votes()->ByWhom(Auth::id(
  <div class="panel-body">
 
  @if (count($replies))
- @include('topics.partials.replies')
+ @include('topics.partials.replies', ['manage_topics' => $currentUser ? $currentUser->can("manage_topics") : false])
  <div id="replies-empty-block" class="empty-block hide">{{ lang('No comments') }}~~</div>
  @else
  <ul class="list-group row"></ul>