keep database\factories

This commit is contained in:
Arno Kaimbacher 2018-08-30 10:04:25 +02:00
parent ffbbc04206
commit d65f7ced34
4 changed files with 8 additions and 7 deletions

View File

@ -1,6 +1,8 @@
<?php <?php
namespace App\Library\Xml; namespace App\Library\Xml;
use App\Models\Title;
/** /**
* DatasetExtension short summary. * DatasetExtension short summary.
* *
@ -13,12 +15,12 @@ trait DatasetExtension
{ {
protected $_externalFields = array( protected $_externalFields = array(
'TitleMain' => array( 'TitleMain' => array(
'model' => 'App\Title', 'model' => Title::class,
'options' => array('type' => 'main'), 'options' => array('type' => 'main'),
'fetch' => 'eager' 'fetch' => 'eager'
), ),
'TitleAbstract' => array( 'TitleAbstract' => array(
'model' => 'App\Title', 'model' => Title::class,
'options' => array('type' => 'abstract'), 'options' => array('type' => 'abstract'),
'fetch' => 'eager' 'fetch' => 'eager'
), ),
@ -53,7 +55,6 @@ trait DatasetExtension
), ),
); );
protected $_internalFields = array(); protected $_internalFields = array();
protected $_fields = array(); protected $_fields = array();

View File

View File

@ -97,11 +97,11 @@
</p>--> </p>-->
</div> </div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded"> <div class="pure-u-1 pure-u-md-1-4 footer-funded">
@hasrole('administrator') @role('administrator')
I'm an administrator! I'm an administrator!
@else @else
I'm not an administrator... I'm not an administrator...
@endhasrole @endrole
</div> </div>
<div class="pure-u-1 pure-u-md-1-4 footer-funded"> <div class="pure-u-1 pure-u-md-1-4 footer-funded">
</div> </div>

View File

@ -92,10 +92,10 @@
<a href="#" class="pure-menu-link">{{ Auth::user()->login }} <span class="fa fa-angle-down"></span></a> <a href="#" class="pure-menu-link">{{ Auth::user()->login }} <span class="fa fa-angle-down"></span></a>
<ul class="pure-menu-children" role="menu"> <ul class="pure-menu-children" role="menu">
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a> </li> <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.edit',['id'=>Auth::user()->id]) }}"><i class="fa fa-user"></i> EDIT</a> </li>
@hasrole('administrator') @role('administrator')
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li> <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('user.index') }}"><i class="fa fa-users"></i> EDIT USERS</a></li>
<li class="pure-menu-item"><a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> EDIT ROLES</a></li> <li class="pure-menu-item"><a class="pure-menu-link" href="{{route('role.index') }}"><i class="fa fa-key"></i> EDIT ROLES</a></li>
@endhasrole @endrole
<li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i> LOG OUT</a></li> <li class="pure-menu-item"><a class="pure-menu-link" href="{{ route('logout') }}"><i class="fa fa-sign-out"></i> LOG OUT</a></li>
</ul> </ul>
</li> </li>