geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

- add name_type 'Personal' and 'Organizational' for persons table (change also user interfaces therefore)

Browse source 
- don't use node-sass anymore
npm updates
- composer updates
- laravel-mix now produces licence files for compiled javascripts
This commit is contained in:
Arno Kaimbacher 2020-10-22 16:36:43 +02:00
parent c649af199c
commit 5bbb3c5876
56 changed files with 17143 additions and 4395 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Publish/EditorController.php
View file

@ -128,6 +128,7 @@ class EditorController extends Controller
->pluck('part1', 'part1');
$contributorTypes = Config::get('enums.contributor_types');
$nameTypes = Config::get('enums.name_types');
// $options = License::all('id', 'name_long');
$licenses = License::select('id', 'name_long', 'link_licence')
@ -152,6 +153,7 @@ class EditorController extends Controller
'titleTypes',
'descriptionTypes',
'contributorTypes',
'nameTypes',
'languages',
'messages',
'projects',
@ -252,7 +254,7 @@ class EditorController extends Controller
} else {
$dataPerson = new Person($person);
$dataPerson->status = true;
$dataPerson->name_type = "Organizational";
// $dataPerson->name_type = "Organizational";
$dataset->persons()->save($dataPerson, $pivot_data);
}
$index++;
@ -275,7 +277,7 @@ class EditorController extends Controller
} else {
$dataPerson = new Person($person);
$dataPerson->status = true;
$dataPerson->name_type = "Organizational";
// $dataPerson->name_type = "Organizational";
$dataset->persons()->save($dataPerson, $pivot_data);
}
$index++;

4
app/Http/Controllers/Publish/IndexController.php
View file

@ -77,6 +77,7 @@ class IndexController extends Controller
$page = Page::query()->where('page_slug', 'terms-and-conditions')->firstOrFail();
$nameTypes = Config::get('enums.name_types');
$contributorTypes = Config::get('enums.contributor_types');
//$relationTypes = array('updates' => 'updates', 'updated-by' => 'updated-by', 'other' => 'other');
@ -92,6 +93,7 @@ class IndexController extends Controller
'titleTypes',
'keywordTypes',
'descriptionTypes',
'nameTypes',
'contributorTypes',
'page'
)
@ -380,7 +382,7 @@ class IndexController extends Controller
} else {
$dataPerson = new Person($person);
$dataPerson->status = true;
$dataPerson->name_type = "Personal";
// $dataPerson->name_type = "Personal";
$dataset->persons()->save($dataPerson, $pivot_data);
}
}

6
app/Http/Controllers/Publish/SubmitController.php
View file

@ -78,6 +78,7 @@ class SubmitController extends Controller
->pluck('part1', 'part1');
$contributorTypes = Config::get('enums.contributor_types');
$nameTypes = Config::get('enums.name_types');
$messages = DB::table('messages')
->pluck('help_text', 'metadata_element');
@ -118,6 +119,7 @@ class SubmitController extends Controller
'titleTypes',
'descriptionTypes',
'contributorTypes',
'nameTypes',
'languages',
'messages',
'projects',
@ -218,7 +220,7 @@ class SubmitController extends Controller
} else {
$dataPerson = new Person($person);
$dataPerson->status = true;
$dataPerson->name_type = "Organizational";
// $dataPerson->name_type = "Organizational";
$dataset->persons()->save($dataPerson, $pivot_data);
}
$index++;
@ -241,7 +243,7 @@ class SubmitController extends Controller
} else {
$dataPerson = new Person($person);
$dataPerson->status = true;
$dataPerson->name_type = "Organizational";
// $dataPerson->name_type = "Organizational";
$dataset->persons()->save($dataPerson, $pivot_data);
}
$index++;