c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update-profil' into 'dev'

Browse Source 
fix bug in news when user is delete

See merge request TheGamecraft/c-cms!107
This commit is contained in:
Mathieu Lagace
2020-07-31 21:40:50 +00:00
parent 2b3b64362a d8e36b8479
commit efd70e3fea
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/version.yml
View File

@@ -5,7 +5,7 @@ current:
major: 3 major: 3
minor: 2 minor: 2
patch: 5 patch: 5
prerelease: 11-g4c5d635d prerelease: 14-g039b09b6
buildmetadata: '' buildmetadata: ''
commit: 41845 commit: 41845
timestamp: timestamp:

2
resources/views/admin/news/index.blade.php
View File

@@ -25,7 +25,7 @@
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h4 class="card-title news-title">{{$n->title}}</h4> <h4 class="card-title news-title">{{$n->title}}</h4>
<p class="category">{{$n->user->fullname()}} - {{$n->created_at}} <p class="category">@if($n->user){{$n->user->fullname()}} -@endif {{$n->created_at}}
<div class="news-tags"> <div class="news-tags">
@if($n->tags != []) @if($n->tags != [])
@foreach($n->tags as $tag) @foreach($n->tags as $tag)

2
resources/views/layouts/public/news.blade.php
View File

@@ -11,7 +11,7 @@
<div class="col-md-4"> <div class="col-md-4">
<h3 class="news-title mb-4">{{ $new->title }}</h3> <h3 class="news-title mb-4">{{ $new->title }}</h3>
<div class="news-body-small"> {!! $new->body !!}</div> <div class="news-body-small"> {!! $new->body !!}</div>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{$new->created_at}}</span> <span class="news-small">@if(\App\User::find($new->user_id)){{ \App\User::find($new->user_id)->fullname()}},@endif {{$new->created_at}}</span>
<div class="news-tags"> <div class="news-tags">
@if($new->tags != []) @if($new->tags != [])
@foreach($new->tags as $tag) @foreach($new->tags as $tag)

2
resources/views/public/allnews.blade.php
View File

@@ -26,7 +26,7 @@
<div class="news-body-small"> <div class="news-body-small">
{!! $new->body !!} {!! $new->body !!}
</div> </div>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span> <span class="news-small">@if(\App\User::find($new->user_id)){{ \App\User::find($new->user_id)->fullname()}},@endif {{ $new->created_at }}</span>
<div class="news-tags"> <div class="news-tags">
@if($new->tags != []) @if($new->tags != [])
@foreach($new->tags as $tag) @foreach($new->tags as $tag)

2
resources/views/public/news.blade.php
View File

@@ -27,7 +27,7 @@
<p> <p>
{!! $new->body !!} {!! $new->body !!}
</p> </p>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span> <span class="news-small">@if(\App\User::find($new->user_id)){{ \App\User::find($new->user_id)->fullname()}},@endif {{ $new->created_at }}</span>
<div class="news-tags"> <div class="news-tags">
@if($new->tags != []) @if($new->tags != [])
@foreach($new->tags as $tag) @foreach($new->tags as $tag)