Mercurial > gemma
changeset 1870:3050d702913a
sections and stretches: only stretches. only sysadmin.
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Thu, 17 Jan 2019 16:41:10 +0100 |
parents | 7622c58fd681 |
children | 8ae7a1fba4cd |
files | client/src/components/ImportStretches.vue client/src/components/Sidebar.vue |
diffstat | 2 files changed, 23 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/ImportStretches.vue Thu Jan 17 16:30:49 2019 +0100 +++ b/client/src/components/ImportStretches.vue Thu Jan 17 16:41:10 2019 +0100 @@ -2,7 +2,7 @@ <div class="d-flex flex-column mb-3"> <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> <font-awesome-icon icon="road" class="mr-2"></font-awesome-icon> - <translate>Define section and stretches</translate> + <translate>Define stretches</translate> </h6> <div class="ml-3 mr-3"> <div class="d-flex flex-row justify-content-between"> @@ -23,18 +23,25 @@ </span> </div> <div class="mt-2 w-50 ml-2 text-left"> - <small class="text-muted"><translate>Function</translate> </small> - <select v-model="funktion" class="custom-select"> - <option value="section"><translate>Section</translate></option> - <option v-if="isSysAdmin" value="stretch" - ><translate>Stretch</translate></option - > - </select> - <span class="text-left text-danger"> - <small v-if="funktionError && !funktion"> - <translate>Please enter a function</translate> + <div> + <small class="text-muted"> + <translate>Countrycode</translate> </small> - </span> + <input + id="countryCode" + type="text" + class="form-control" + placeholder="AT" + aria-label="id" + v-model="id" + /> + <span class="text-left text-danger"> + <small v-if="countryCodeError && !countryCode"> + <translate>Please enter a countrycode </translate> + </small> + </span> + </div> + <div class="w-50 ml-2"></div> </div> </div> <div class="d-flex flex-column justify-content-between"> @@ -159,28 +166,6 @@ </span> </div> </div> - <div - v-if="funktion === 'stretch'" - class="d-flex flex-row justify-content-between" - > - <div class="mt-2 w-50 mr-2 text-left "> - <small class="text-muted"> <translate>Countrycode</translate> </small> - <input - id="countryCode" - type="text" - class="form-control" - placeholder="AT" - aria-label="id" - v-model="id" - /> - <span class="text-left text-danger"> - <small v-if="countryCodeError && !countryCode"> - <translate>Please enter a countrycode </translate> - </small> - </span> - </div> - <div class="w-50 ml-2"></div> - </div> </div> <div class="text-right mt-2 mr-3 mb-3"> <button
--- a/client/src/components/Sidebar.vue Thu Jan 17 16:30:49 2019 +0100 +++ b/client/src/components/Sidebar.vue Thu Jan 17 16:41:10 2019 +0100 @@ -40,6 +40,8 @@ ></font-awesome-icon> <span class="fix-trans-space" v-translate>Staging area</span> </a> + </div> + <div v-if="isSysAdmin"> <a :class="['secondary', { active: isActive('stretches') }]" @click="toggleContextBox('stretches')" @@ -54,6 +56,8 @@ >Define sections and stretches</span > </a> + </div> + <div v-if="isWaterwayAdmin"> <small class="text-muted pl-3"> <translate>Import</translate> </small> <hr class="m-0" /> <router-link to="/importsoundingresults">