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

- doi url for dc:identifier

Browse source 
- readonly keywords with id for editor and submitter for edit forms
This commit is contained in:
Arno Kaimbacher 2021-06-10 16:15:01 +02:00
parent d80a8ab3f4
commit 28a38da865
6 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Oai/RequestController.php
View file

@ -125,6 +125,7 @@ class RequestController extends Controller
$this->proc->setParameter('', 'baseURL', url('/') . $uri[0]);
$this->proc->setParameter('', 'repURL', url('/'));
$this->proc->setParameter('', 'downloadLink', url('/') . '/file/download/');
$this->proc->setParameter('', 'doiLink', 'https://doi.org/');
// $resumptionPath = $this->configuration->getResumptionTokenPath();

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

@ -386,15 +386,21 @@ class EditorController extends Controller
if (is_array($keywords) && count($keywords) > 0) {
foreach ($keywords as $key => $formKeyword) {
if (isset($formKeyword['id'])) {
// is readonly
$subject = Subject::findOrFail($formKeyword['id']);
$subject->value = $formKeyword['value'];
$subject->type = $formKeyword['type'];
if ($subject->isDirty()) {
$subject->save();
}
// $subject->value = $formKeyword['value'];
// $subject->type = $formKeyword['type'];
// if ($subject->isDirty()) {
// $subject->save();
// }
} else {
$subject = new Subject($formKeyword);
$dataset->subjects()->save($subject);
// $subject = new Subject($formKeyword);
// $dataset->subjects()->save($subject);
$keyword = Subject::firstOrCreate(
['value' => $formKeyword['value'], 'language' => $formKeyword['language']],
$formKeyword
);
$dataset->subjects()->attach($keyword);
}
}
}

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

@ -317,14 +317,19 @@ class SubmitController extends Controller
foreach ($keywords as $key => $formKeyword) {
if (isset($formKeyword['id'])) {
$subject = Subject::findOrFail($formKeyword['id']);
$subject->value = $formKeyword['value'];
$subject->type = $formKeyword['type'];
if ($subject->isDirty()) {
$subject->save();
}
// $subject->value = $formKeyword['value'];
// $subject->type = $formKeyword['type'];
// if ($subject->isDirty()) {
// $subject->save();
// }
} else {
$subject = new Subject($formKeyword);
$dataset->subjects()->save($subject);
// $subject = new Subject($formKeyword);
// $dataset->subjects()->save($subject);
$keyword = Subject::firstOrCreate(
['value' => $formKeyword['value'], 'language' => $formKeyword['language']],
$formKeyword
);
$dataset->subjects()->attach($keyword);
}
}
}