- composer updates
- no submitters for dataset - preferred reviewer instead of preferred editor
This commit is contained in:
Arno Kaimbacher
parent
2d483f686e
commit
aac9196650
|
|
@ -349,14 +349,14 @@ class IndexController extends Controller
|
|||
}
|
||||
|
||||
//store submitters
|
||||
if (isset($data['submitters'])) {
|
||||
//$data_to_sync = [];
|
||||
foreach ($request->get('submitters') as $key => $submitter_id) {
|
||||
$pivot_data = ['role' => 'submitter', 'sort_order' => $key + 1];
|
||||
$data_to_sync[$submitter_id] = $pivot_data;
|
||||
}
|
||||
//$dataset->persons()->sync($data_to_sync);
|
||||
}
|
||||
// if (isset($data['submitters'])) {
|
||||
// //$data_to_sync = [];
|
||||
// foreach ($request->get('submitters') as $key => $submitter_id) {
|
||||
// $pivot_data = ['role' => 'submitter', 'sort_order' => $key + 1];
|
||||
// $data_to_sync[$submitter_id] = $pivot_data;
|
||||
// }
|
||||
// //$dataset->persons()->sync($data_to_sync);
|
||||
// }
|
||||
$dataset->persons()->sync($data_to_sync);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ use App\Models\XmlCache;
|
|||
use App\Models\File;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\GeolocationBox;
|
||||
// use App\Models\GeolocationBox;
|
||||
use App\Models\Coverage;
|
||||
|
||||
class Dataset extends Model
|
||||
|
|
@ -37,7 +37,8 @@ class Dataset extends Model
|
|||
'embargo_date',
|
||||
'belongs_to_bibliography',
|
||||
'editor_id',
|
||||
'preferred_editor',
|
||||
'preferred_reviewer',
|
||||
'preferred_reviewer_email',
|
||||
'reviewer_id'
|
||||
];
|
||||
//protected $guarded = [];
|
||||
|
|
|
|||
99
composer.lock
generated
99
composer.lock
generated
|
|
@ -1696,7 +1696,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
|
|
@ -1768,16 +1768,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/contracts",
|
||||
"version": "v1.0.2",
|
||||
"version": "v1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/contracts.git",
|
||||
"reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
|
||||
"reference": "d3636025e8253c6144358ec0a62773cae588395b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
|
||||
"reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
|
||||
"url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b",
|
||||
"reference": "d3636025e8253c6144358ec0a62773cae588395b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1785,19 +1785,22 @@
|
|||
},
|
||||
"require-dev": {
|
||||
"psr/cache": "^1.0",
|
||||
"psr/container": "^1.0"
|
||||
"psr/container": "^1.0",
|
||||
"symfony/polyfill-intl-idn": "^1.10"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/cache": "When using the Cache contracts",
|
||||
"psr/container": "When using the Service contracts",
|
||||
"symfony/cache-contracts-implementation": "",
|
||||
"symfony/event-dispatcher-implementation": "",
|
||||
"symfony/http-client-contracts-implementation": "",
|
||||
"symfony/service-contracts-implementation": "",
|
||||
"symfony/translation-contracts-implementation": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0-dev"
|
||||
"dev-master": "1.1-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -1832,11 +1835,11 @@
|
|||
"interoperability",
|
||||
"standards"
|
||||
],
|
||||
"time": "2018-12-05T08:06:11+00:00"
|
||||
"time": "2019-04-27T14:29:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
|
|
@ -1889,7 +1892,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
|
|
@ -1945,7 +1948,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v3.4.26",
|
||||
"version": "v3.4.27",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
|
|
@ -2008,7 +2011,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
|
|
@ -2057,16 +2060,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6"
|
||||
"reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/6ebbe61f48069033225c9d3fa7eb5ed116d766d6",
|
||||
"reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/1ea878bd3af18f934dedb8c0de60656a9a31a718",
|
||||
"reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2107,7 +2110,7 @@
|
|||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2019-04-17T14:56:00+00:00"
|
||||
"time": "2019-05-01T08:36:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
|
|
@ -2491,7 +2494,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
|
|
@ -2540,16 +2543,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
"reference": "0e5719d216017b1a0342fa48e86467cedca1c954"
|
||||
"reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/0e5719d216017b1a0342fa48e86467cedca1c954",
|
||||
"reference": "0e5719d216017b1a0342fa48e86467cedca1c954",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
|
||||
"reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2612,20 +2615,20 @@
|
|||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2019-04-14T18:04:59+00:00"
|
||||
"time": "2019-04-27T09:38:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "46c0dede1f925383d13dc783857be2c41efd0b24"
|
||||
"reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/46c0dede1f925383d13dc783857be2c41efd0b24",
|
||||
"reference": "46c0dede1f925383d13dc783857be2c41efd0b24",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/181a426dd129cb496f12d7e7555f6d0b37a7615b",
|
||||
"reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2687,20 +2690,20 @@
|
|||
],
|
||||
"description": "Symfony Translation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2019-04-10T16:20:36+00:00"
|
||||
"time": "2019-05-01T12:55:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v4.2.7",
|
||||
"version": "v4.2.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
"reference": "e760a38e12b15032325e64be63f7ffc1817af617"
|
||||
"reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e760a38e12b15032325e64be63f7ffc1817af617",
|
||||
"reference": "e760a38e12b15032325e64be63f7ffc1817af617",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
|
||||
"reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2763,7 +2766,7 @@
|
|||
"debug",
|
||||
"dump"
|
||||
],
|
||||
"time": "2019-04-17T14:57:01+00:00"
|
||||
"time": "2019-05-01T12:55:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "tijsverkoyen/css-to-inline-styles",
|
||||
|
|
@ -3326,16 +3329,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpdocumentor/reflection-docblock",
|
||||
"version": "4.3.0",
|
||||
"version": "4.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
|
||||
"reference": "94fd0001232e47129dd3504189fa1c7225010d08"
|
||||
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
|
||||
"reference": "94fd0001232e47129dd3504189fa1c7225010d08",
|
||||
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
|
||||
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3373,7 +3376,7 @@
|
|||
}
|
||||
],
|
||||
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
|
||||
"time": "2017-11-30T07:14:17+00:00"
|
||||
"time": "2019-04-30T17:48:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpdocumentor/type-resolver",
|
||||
|
|
@ -3739,16 +3742,16 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "7.5.9",
|
||||
"version": "7.5.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
|
||||
"reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
|
||||
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/64cb33f5b520da490a7b13149d39b43cf3c890c6",
|
||||
"reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3819,7 +3822,7 @@
|
|||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2019-04-19T15:50:46+00:00"
|
||||
"time": "2019-05-14T04:53:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/code-unit-reverse-lookup",
|
||||
|
|
@ -3988,16 +3991,16 @@
|
|||
},
|
||||
{
|
||||
"name": "sebastian/environment",
|
||||
"version": "4.2.1",
|
||||
"version": "4.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/environment.git",
|
||||
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a"
|
||||
"reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
|
||||
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
|
||||
"reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4037,7 +4040,7 @@
|
|||
"environment",
|
||||
"hhvm"
|
||||
],
|
||||
"time": "2019-04-25T07:55:20+00:00"
|
||||
"time": "2019-05-05T09:05:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/exporter",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -51,11 +51,11 @@ function initialState() {
|
|||
titles: [],
|
||||
descriptions: [],
|
||||
checkedContributors: [],
|
||||
checkedSubmitters: [],
|
||||
// checkedSubmitters: [],
|
||||
|
||||
persons: [],
|
||||
contributors: [],
|
||||
submitters: []
|
||||
// submitters: []
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -264,9 +264,9 @@ const app = new Vue({
|
|||
for (var i = 0; i < this.dataset.checkedContributors.length; i++) {
|
||||
formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]);
|
||||
}
|
||||
for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) {
|
||||
formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]);
|
||||
}
|
||||
// for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) {
|
||||
// formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]);
|
||||
// }
|
||||
|
||||
for (var i = 0; i < this.dataset.references.length; i++) {
|
||||
let reference = this.dataset.references[i];
|
||||
|
|
@ -438,14 +438,14 @@ const app = new Vue({
|
|||
this.dataset.checkedContributors.push(person.id);
|
||||
}
|
||||
},
|
||||
onAddSubmitter(person) {
|
||||
//if person is not in submitters array
|
||||
//if (this.submitters.includes(person) == false) {
|
||||
if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {
|
||||
this.dataset.submitters.push(person);
|
||||
this.dataset.checkedSubmitters.push(person.id);
|
||||
}
|
||||
},
|
||||
// onAddSubmitter(person) {
|
||||
// //if person is not in submitters array
|
||||
// //if (this.submitters.includes(person) == false) {
|
||||
// if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {
|
||||
// this.dataset.submitters.push(person);
|
||||
// this.dataset.checkedSubmitters.push(person.id);
|
||||
// }
|
||||
// },
|
||||
/*
|
||||
Removes a select file the user has uploaded
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ const app = new Vue({
|
|||
return {
|
||||
dataset: {
|
||||
firstName: '',
|
||||
preferred_editor: ''
|
||||
preferred_reviewer: '',
|
||||
preferred_reviewer_email: ''
|
||||
},
|
||||
submitted: false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,16 +210,19 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
|
||||
<div :class="{'form-group':true, 'has-error':errors.has('rights')}">
|
||||
<legend>Einräumung eines einfachen Nutzungsrechts</legend>
|
||||
<div :class="{'form-group':true, 'has-error':errors.has('step-1.rights')}">
|
||||
{{-- <legend>Einräumung eines einfachen Nutzungsrechts</legend> --}}
|
||||
|
||||
<label for="rights" class="pure-checkbox">
|
||||
<input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights" v-validate="'required'" data-vv-scope="step-1">
|
||||
I accept
|
||||
</label>
|
||||
<button @click="showModal" class="pure-button button-small is-success">
|
||||
<label for="rights">
|
||||
<input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights" v-validate="'required'" data-vv-scope="step-1">
|
||||
terms and conditions
|
||||
</label>
|
||||
<i class="fas fa-info-circle" @click="showModal" style="font-size:24px"></i>
|
||||
|
||||
|
||||
{{-- <button @click="showModal" class="pure-button button-small is-success">
|
||||
{!! trans('validation.attributes.backend.create-dataset.terms_and_conditions').'*' !!}
|
||||
</button>
|
||||
</button> --}}
|
||||
|
||||
<!-- use the modal component, pass in the prop -->
|
||||
{{-- <button type="button" class="btn" @click="showModal">
|
||||
|
|
@ -238,7 +241,7 @@
|
|||
|
||||
|
||||
<br />
|
||||
<i v-show="errors.has('step-1.rights')" class="fa fa-warning"></i>
|
||||
<i v-show="errors.has('step-1.rights')" class="fas fa-exclamation-circle"></i>
|
||||
<span v-show="errors.has('step-1.rights')" class="text-danger">@{{ errors.first('step-1.rights') }}</span>
|
||||
|
||||
|
||||
|
|
@ -565,7 +568,7 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset id="fieldset-submitters">
|
||||
{{-- <fieldset id="fieldset-submitters">
|
||||
<legend>Submitters</legend>
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1 pure-u-md-1-2 pure-div">
|
||||
|
|
@ -582,7 +585,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</fieldset> --}}
|
||||
<br />
|
||||
<div class="pure-controls">
|
||||
<button @click.prevent="prev()" class="pure-button button-small">
|
||||
|
|
|
|||
|
|
@ -22,6 +22,17 @@
|
|||
<legend>General</legend>
|
||||
<div class="pure-g">
|
||||
|
||||
<div class="pure-u-1 pure-u-md-1-1 pure-div">
|
||||
{!! Form::label('reviewer_id', 'preferred reviewer from the submitter:') !!}
|
||||
<p>
|
||||
{!! $dataset->preferred_reviewer !!}<br>
|
||||
{!! $dataset->preferred_reviewer_email !!}
|
||||
</p>
|
||||
<p>
|
||||
|
||||
</p>
|
||||
{{-- <span class="help is-danger"> {!! $message !!}</span> --}}
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-md-1-2 pure-div">
|
||||
{!! Form::label('reviewer_id', 'reviewer:') !!}
|
||||
<div class="select pure-u-23-24">
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@
|
|||
{{ $dataset->server_state }}
|
||||
</td>
|
||||
@if ($dataset->server_state == "released")
|
||||
{{-- <td>Preferred editor: {{ optional($dataset->editor)->login }} </td> --}}
|
||||
<td>Preferred editor: {{ $dataset->preferred_editor }} </td>
|
||||
{{-- <td>Preferred reviewer: {{ optional($dataset->reviewer)->login }} </td> --}}
|
||||
<td>Preferred reviewer: {{ $dataset->preferred_reviewer }} </td>
|
||||
@elseif ($dataset->server_state == "editor_accepted")
|
||||
<td>in approvement by {{ optional($dataset->editor)->login }} </td>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -33,14 +33,11 @@
|
|||
<div class="pure-g">
|
||||
|
||||
<div class="pure-u-1 pure-u-md-1-1 pure-div">
|
||||
{!! Form::label('editor_id', 'preferred editor:') !!}
|
||||
{!! $dataset->preferred_editor !!}
|
||||
|
||||
<span class="help is-danger"> {!! $message !!}</span>
|
||||
|
||||
{{-- <span class="help is-danger" v-if="errors.has('editor_id')" v-text="errors.first('editor_id')"></span> --}}
|
||||
|
||||
{{-- {!! Form::label('editor_id', 'preferred editor:') !!}
|
||||
{!! $dataset->preferred_editor !!}
|
||||
<span class="help is-danger"> {!! $message !!}</span> --}}
|
||||
</div>
|
||||
|
||||
<div class="pure-u-1 pure-u-md-1-1 pure-div">
|
||||
{!! Form::label('owner', 'dataset owner:') !!}
|
||||
{!! $dataset->user->login !!}
|
||||
|
|
|
|||
|
|
@ -28,18 +28,29 @@
|
|||
<legend>General</legend>
|
||||
<div class="pure-g">
|
||||
|
||||
<div class="pure-u-1 pure-u-md-1-2 pure-div">
|
||||
{!! Form::label('preferred_editor', 'preferred editor:') !!}
|
||||
<div class="pure-u-1 pure-u-md-1-1 pure-div">
|
||||
{!! Form::label('preferred_reviewer', 'name of preferred reviewer:') !!}
|
||||
|
||||
{{-- {!! Form::select('editor_id', $editors, null, ['id' => 'editor_id', 'placeholder' => '-- select editor --', 'v-model' =>
|
||||
'dataset.editor_id', "v-validate" => "'required'"]) !!} --}}
|
||||
{!! Form::text('preferred_editor', null, ['id' => 'preferred_editor', 'class'=>'pure-u-23-24',
|
||||
'placeholder' => '-- enter name of preferred editor --',
|
||||
'v-model' => 'dataset.preferred_editor', "v-validate" => "'required|min:3|max:20'"]) !!}
|
||||
{!! Form::text('preferred_reviewer', null, ['id' => 'preferred_reviewer', 'class'=>'pure-u-23-24',
|
||||
'placeholder' => '-- enter name of preferred reviewer --',
|
||||
'v-model' => 'dataset.preferred_reviewer', "v-validate" => "'required|min:3|max:20'"]) !!}
|
||||
<em>*</em>
|
||||
|
||||
<span class="help is-danger" v-if="errors.has('preferred_editor')" v-text="errors.first('preferred_editor')"></span>
|
||||
<span class="help is-danger" v-if="errors.has('preferred_reviewer')" v-text="errors.first('preferred_reviewer')"></span>
|
||||
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-md-1-1 pure-div">
|
||||
{!! Form::label('preferred_reviewer_email', 'email of preferred reviewer:') !!}
|
||||
{!! Form::text('preferred_reviewer_email', null, array(
|
||||
'placeholder' => 'Email', 'id' => 'preferred_reviewer_email', 'class' => 'pure-u-23-24',
|
||||
'v-model' => 'dataset.preferred_reviewer_email', "v-validate" => "'required|email'"
|
||||
)) !!}
|
||||
<em>*</em>
|
||||
|
||||
<span class="help is-danger" v-if="errors.has('preferred_reviewer_email')" v-text="errors.first('preferred_reviewer_email')"></span>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user