Browse Source

show description for fields, respect 'truncate' attribute on config view

pull/1/head
Jonathan Cobb 4 years ago
parent
commit
995c996c44
3 changed files with 7 additions and 5 deletions
  1. +1
    -1
      src/_components/FormField.vue
  2. +5
    -3
      src/_helpers/util.js
  3. +1
    -1
      src/account/AppConfigPage.vue

+ 1
- 1
src/_components/FormField.vue View File

@@ -10,7 +10,7 @@
<input v-else-if="field.control === 'flag'" type="checkbox" v-model="thing[field.name]" :name="field" class="form-control" />
<input v-else type="text" v-model="thing[field.name]" :name="field" class="form-control" />

<!-- <small v-if="messages['!'+messagePrefix+field+'_description']">{{messages[messagePrefix+field+'_description']}}</small>-->
<small v-if="messages['!'+messagePrefix+field.name+'_description']">{{messages[messagePrefix+field.name+'_description']}}</small>
<!-- <div v-if="errors.has(field)" class="invalid-feedback d-block">{{ errors.first(field) }}</div>-->
</div>



+ 5
- 3
src/_helpers/util.js View File

@@ -3,6 +3,7 @@
* For personal (non-commercial) use, see license: https://bubblev.com/bubble-license/
*/
import config from 'config';
import { ErrorBag } from 'vee-validate';

let landingPage = null;

@@ -128,9 +129,10 @@ export const util = {
console.log('handleCrudResponse: received 404: ' + JSON.stringify(data));

} else if (response.status === 422) {
console.log('handleCrudResponse: received 422, error: ' + JSON.stringify(data));
const errors = util.setValidationErrors(data, messages, errors, enableTotpModal);
return Promise.reject(errors);
// console.log('handleCrudResponseA: errors='+JSON.stringify(errors));
const validationErrors = util.setValidationErrors(data, messages, errors, enableTotpModal);
// console.log('handleCrudResponseB: errors='+JSON.stringify(errors)+', validationErrors='+JSON.stringify(validationErrors));
return Promise.reject(validationErrors);
}

const error = (data && data.message) || response.statusText;


+ 1
- 1
src/account/AppConfigPage.vue View File

@@ -42,7 +42,7 @@
<span v-else-if="field === 'ctime' || field === 'mtime'">
{{messages.date_format_app_data_epoch_time.parseDateMessage(row[field], messages)}}
</span>
<span v-else-if="(''+row[field]).length < 30">
<span v-else-if="(''+row[field]).length < 30 || (typeof appFields[field].truncate !== 'undefined' && appFields[field].truncate === false)">
<span v-if="typeof appFields[field] !== 'undefined' && typeof appFields[field].type !== 'undefined' && appFields[field].type === 'http_url'">
<a :href="row[field]" target="_blank">{{row[field]}}</a>
</span>


Loading…
Cancel
Save