- laravel framework upgrade frpm 7.x to 8. see also: https://laravel.com/docs/8.x/upgrade#assert-exact-json-method
- use PHP7 null coalesce operator instead of laravel optional method - change Breadcrumbs::register method to Bredcrumbs::for method - composer updates
This commit is contained in:
parent
1b2e77d907
commit
8ea540a88c
50 changed files with 616 additions and 263 deletions
|
@ -3,10 +3,13 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use App\Models\Dataset;
|
||||
|
||||
class Collection extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
public $timestamps = false;
|
||||
//mass assignable
|
||||
protected $fillable = [
|
||||
|
|
|
@ -3,11 +3,14 @@
|
|||
namespace App\Models;
|
||||
|
||||
use App\Models\Collection;
|
||||
use App\Models\Dataset;
|
||||
// use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class CollectionRole extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'collections_roles';
|
||||
public $timestamps = false;
|
||||
protected $fillable = [
|
||||
|
|
|
@ -2,11 +2,13 @@
|
|||
namespace App\Models;
|
||||
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use DateTimeInterface;
|
||||
|
||||
class Coverage extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'coverage';
|
||||
public $timestamps = true;
|
||||
protected $dateFormat = 'Y-m-d H:i:s';
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use App\Library\Xml\DatasetExtension;
|
||||
use App\Models\Collection;
|
||||
use App\Models\Coverage;
|
||||
|
@ -20,7 +21,7 @@ use Illuminate\Database\Eloquent\Model;
|
|||
|
||||
class Dataset extends Model
|
||||
{
|
||||
use DatasetExtension;
|
||||
use DatasetExtension, HasFactory;
|
||||
protected $table = 'documents';
|
||||
|
||||
//public $timestamps = false; //default true
|
||||
|
|
|
@ -3,9 +3,11 @@ namespace App\Models;
|
|||
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class DatasetIdentifier extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'dataset_identifiers';
|
||||
protected $guarded = array();
|
||||
public $timestamps = true;
|
||||
|
|
|
@ -4,9 +4,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class DatasetReference extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'document_references';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Description extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'dataset_abstracts';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -5,9 +5,11 @@ namespace App\Models;
|
|||
use App\Models\Dataset;
|
||||
use App\Models\HashValue;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class File extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'document_files';
|
||||
public $timestamps = true;
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@ namespace App\Models;
|
|||
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class GeolocationBox extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'geolocation_box';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -4,9 +4,11 @@ namespace App\Models;
|
|||
|
||||
use App\Models\File;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class HashValue extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'file_hashvalues';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Language extends Model
|
||||
{
|
||||
|
||||
use HasFactory;
|
||||
//protected $table = 'languages';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class License extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'document_licences';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -3,8 +3,9 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Message extends Model
|
||||
{
|
||||
//
|
||||
use HasFactory;
|
||||
}
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class MimeType extends Model
|
||||
{
|
||||
|
||||
use HasFactory;
|
||||
protected $table = 'mime_types';
|
||||
|
||||
// for using $input = $request->all();
|
||||
|
|
|
@ -8,9 +8,11 @@ use App\Models\User;
|
|||
use Illuminate\Database\Eloquent\Model;
|
||||
use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
|
||||
use Astrotomic\Translatable\Translatable;// use Dimsav\Translatable\Translatable;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Page extends Model implements TranslatableContract
|
||||
{
|
||||
use HasFactory;
|
||||
use ModelTrait;
|
||||
use Translatable; // 2. To add translation methods
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class PageTranslation extends Model
|
||||
{
|
||||
Use HasFactory;
|
||||
public $timestamps = false;
|
||||
protected $fillable = ['title', 'description'];
|
||||
protected $guarded = ['id'];
|
||||
|
|
|
@ -4,9 +4,11 @@ namespace App\Models;
|
|||
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Person extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $fillable = [
|
||||
'academic_title',
|
||||
'date_of_birth',
|
||||
|
|
|
@ -3,10 +3,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Project extends Model
|
||||
{
|
||||
|
||||
use HasFactory;
|
||||
//protected $table = 'projects';
|
||||
|
||||
// for using $input = $request->all();
|
||||
|
|
|
@ -3,9 +3,11 @@
|
|||
namespace App\Models;
|
||||
|
||||
use Zizaco\Entrust\EntrustRole;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Role extends EntrustRole
|
||||
{
|
||||
use HasFactory;
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
|
|
|
@ -4,9 +4,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Subject extends Model
|
||||
{
|
||||
Use HasFactory;
|
||||
// protected $table = 'document_subjects';
|
||||
protected $table = 'dataset_subjects';
|
||||
public $timestamps = false;
|
||||
|
|
|
@ -3,9 +3,11 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Models\Dataset;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
|
||||
class Title extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
protected $table = 'dataset_titles';
|
||||
public $timestamps = false;
|
||||
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
// use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Zizaco\Entrust\Traits\EntrustUserTrait;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Collection;
|
||||
|
@ -12,7 +14,7 @@ use App\Models\Dataset;
|
|||
class User extends Authenticatable
|
||||
{
|
||||
// use Authenticatable, CanResetPassword, Authorizable;
|
||||
use Notifiable;
|
||||
use HasFactory, Notifiable;
|
||||
|
||||
// use HasRoles;
|
||||
use EntrustUserTrait;
|
||||
|
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue