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

- add translated description

Browse source 
- creator required
- filesize vrom ini file
- correctly delete dataset in SubmitController
This commit is contained in:
Arno Kaimbacher 2019-07-03 18:32:41 +02:00
parent 4f8ef4fc30
commit a463cb9e4c
10 changed files with 79 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/assets/js/datasetPublish.js
View file

@ -114,7 +114,7 @@ const app = new Vue({
});
// add the required rule
VeeValidate.Validator.extend('translatedLanguage', {
getMessage: field => 'The translated title must be in a language other than than the dataset language.',
getMessage: field => 'The translated ' + field + ' must be in a language other than than the dataset language.',
validate: (value, [mainLanguage, type]) => {
if (type == "translated") {
return value !== mainLanguage;

11
resources/views/publish/create-step1.blade.php
View file

@ -114,7 +114,7 @@
</td>
<td>
{!! Form::select('Title[Language]', $languages, null,
['placeholder' => '[language]', 'v-model' => 'item.language',
['placeholder' => '[language]', 'v-model' => 'item.language', "data-vv-as" => "title",
"v-validate" => "{required: true, translatedLanguage: [dataset.language, item.type]}",
'data-vv-scope' => 'step-1']) !!}
</td>
@ -168,7 +168,11 @@
</td>
<td>
{!! Form::select('Description[Language]', $languages, null,
['placeholder' => '[language]', 'v-model' => 'item.language', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
['placeholder' => '[language]',
'v-model' => 'item.language',
"data-vv-as" => "description",
"v-validate" => "{required: true, translatedLanguage: [dataset.language, item.type]}",
'data-vv-scope' => 'step-1']) !!}
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeDescription(index)">-</button>
@ -202,6 +206,7 @@
{!! Form::label('additionalCreators', 'Add additional creator(s) if creator is not in database') !!}
<button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button>
</div>
<input name="persons" v-model="dataset.persons" type="hidden" class="form-check-input" v-validate="'required'" data-vv-as="Creator" data-vv-scope="step-1">
<table class="pure-table pure-table-horizontal" v-if="dataset.persons.length">
<thead>
<tr>
@ -680,7 +685,7 @@
@{{ index +1 }}
</td>
<td>
<input class="form-control" v-model="item.file.name" />
<input class="form-control" v-model="item.file.name" readonly />
</td>
<td>
<input class="form-control" v-model="item.label" />

4
resources/views/settings/layouts/app.blade.php
View file

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>Admin PureRDR</title>
<title>BACKEND RDR</title>
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
{{-- <link rel='stylesheet' href="{{ asset('css/pure-min.css') }}" />
@ -30,7 +30,7 @@
<div id="menu">
<nav class="pure-menu sidebar-menu">
<h1 class="site-logo">Admin<strong>Rdr</strong></h1>
<h1 class="site-logo">Backend<strong>RDR</strong></h1>
{{-- <div class="menu-item-divided"></div> --}}
{{-- <h2 class="pure-menu-heading">Home</h2> --}}