mirror of
https://github.com/documize/community.git
synced 2025-08-05 05:25:27 +02:00
New config setting: how many tags per document?
This commit is contained in:
Harvey Kandola
parent
0743ae002c
commit
19736aab04
17 changed files with 827 additions and 731 deletions
|
|
@ -17,6 +17,7 @@ import Notifier from '../../mixins/notifier';
|
|||
import Component from '@ember/component';
|
||||
|
||||
export default Component.extend(Notifier, {
|
||||
maxTags: 3,
|
||||
titleEmpty: empty('model.general.title'),
|
||||
messageEmpty: empty('model.general.message'),
|
||||
conversionEndpointEmpty: empty('model.general.conversionEndpoint'),
|
||||
|
|
@ -24,7 +25,19 @@ export default Component.extend(Notifier, {
|
|||
hasMessageInputError: and('messageEmpty', 'messageError'),
|
||||
hasConversionEndpointInputError: and('conversionEndpointEmpty', 'conversionEndpointError'),
|
||||
|
||||
didReceiveAttrs() {
|
||||
this._super(...arguments);
|
||||
this.set('maxTags', this.get('model.general.maxTags'));
|
||||
},
|
||||
|
||||
actions: {
|
||||
change() {
|
||||
const selectEl = this.$('#maxTags')[0];
|
||||
const selection = selectEl.selectedOptions[0].value;
|
||||
|
||||
this.set('maxTags', parseInt(selection));
|
||||
},
|
||||
|
||||
save() {
|
||||
if (isEmpty(this.get('model.general.title'))) {
|
||||
set(this, 'titleError', true);
|
||||
|
|
@ -46,6 +59,7 @@ export default Component.extend(Notifier, {
|
|||
this.set('model.general.conversionEndpoint', e.substring(0, e.length-1));
|
||||
}
|
||||
|
||||
this.set('model.general.maxTags', this.get('maxTags'));
|
||||
this.model.general.set('allowAnonymousAccess', $("#allowAnonymousAccess").prop('checked'));
|
||||
|
||||
this.showWait();
|
||||
|
|
|
|||
|
|
@ -18,9 +18,11 @@ import Notifier from '../../mixins/notifier';
|
|||
import Component from '@ember/component';
|
||||
|
||||
export default Component.extend(Notifier, {
|
||||
appMeta: service(),
|
||||
documentSvc: service('document'),
|
||||
categoryService: service('category'),
|
||||
|
||||
tagz: A([]),
|
||||
categories: A([]),
|
||||
newCategory: '',
|
||||
showCategoryModal: false,
|
||||
|
|
@ -34,11 +36,6 @@ export default Component.extend(Notifier, {
|
|||
return this.get('permissions.spaceOwner') || this.get('permissions.spaceManage');
|
||||
}),
|
||||
|
||||
maxTags: 3,
|
||||
tag1: '',
|
||||
tag2: '',
|
||||
tag3: '',
|
||||
|
||||
didReceiveAttrs() {
|
||||
this._super(...arguments);
|
||||
this.load();
|
||||
|
|
@ -48,7 +45,7 @@ export default Component.extend(Notifier, {
|
|||
this._super(...arguments);
|
||||
|
||||
schedule('afterRender', () => {
|
||||
$("#add-tag-field0").focus();
|
||||
$("#add-tag-field-1").focus();
|
||||
|
||||
$(".tag-input").off("keydown").on("keydown", function(e) {
|
||||
if (e.shiftKey && e.which === 9) {
|
||||
|
|
@ -59,7 +56,20 @@ export default Component.extend(Notifier, {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (e.which === 9 || e.which === 13 || e.which === 16 || e.which === 45 || e.which === 189 || e.which === 8 || e.which === 127 || (e.which >= 65 && e.which <= 90) || (e.which >= 97 && e.which <= 122) || (e.which >= 48 && e.which <= 57)) {
|
||||
if (e.which === 9 ||
|
||||
e.which === 13 ||
|
||||
e.which === 16 ||
|
||||
e.which === 37 ||
|
||||
e.which === 38 ||
|
||||
e.which === 39 ||
|
||||
e.which === 40 ||
|
||||
e.which === 45 ||
|
||||
e.which === 189 ||
|
||||
e.which === 8 ||
|
||||
e.which === 127 ||
|
||||
(e.which >= 65 && e.which <= 90) ||
|
||||
(e.which >= 97 && e.which <= 122) ||
|
||||
(e.which >= 48 && e.which <= 57)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -90,17 +100,27 @@ export default Component.extend(Notifier, {
|
|||
});
|
||||
});
|
||||
|
||||
let counter = 1;
|
||||
let tagz = A([]);
|
||||
let maxTags = this.get('appMeta.maxTags');
|
||||
|
||||
if (!_.isUndefined(this.get('document.tags')) && this.get('document.tags').length > 1) {
|
||||
let tags = this.get('document.tags').split('#');
|
||||
let counter = 1;
|
||||
|
||||
_.each(tags, (tag) => {
|
||||
tag = tag.trim();
|
||||
if (tag.length > 0) {
|
||||
this.set('tag' + counter, tag);
|
||||
if (tag.length > 0 && counter <= maxTags) {
|
||||
tagz.pushObject({number: counter, value: tag});
|
||||
counter++;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
for (let index = counter; index <= maxTags; index++) {
|
||||
tagz.pushObject({number: index, value: ''});
|
||||
}
|
||||
|
||||
this.set('tagz', tagz);
|
||||
},
|
||||
|
||||
actions: {
|
||||
|
|
@ -142,27 +162,26 @@ export default Component.extend(Notifier, {
|
|||
});
|
||||
});
|
||||
|
||||
let tag1 = this.get("tag1").toLowerCase().trim();
|
||||
let tag2 = this.get("tag2").toLowerCase().trim();
|
||||
let tag3 = this.get("tag3").toLowerCase().trim();
|
||||
let tagz = this.get('tagz');
|
||||
let tagzToSave = [];
|
||||
|
||||
_.each(tagz, (t) => {
|
||||
let tag = t.value.toLowerCase().trim();
|
||||
if (tag.length> 0) {
|
||||
if (!_.contains(tagzToSave, tag) && is.not.startWith(tag, '-')) {
|
||||
tagzToSave.push(tag);
|
||||
this.$('#add-tag-field-' + t.number).removeClass('is-invalid');
|
||||
} else {
|
||||
this.$('#add-tag-field-' + t.number).addClass('is-invalid');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
let save = "#";
|
||||
|
||||
if (is.startWith(tag1, '-')) {
|
||||
$('#add-tag-field1').addClass('is-invalid');
|
||||
return;
|
||||
}
|
||||
if (is.startWith(tag2, '-')) {
|
||||
$('#add-tag-field2').addClass('is-invalid');
|
||||
return;
|
||||
}
|
||||
if (is.startWith(tag3, '-')) {
|
||||
$('#add-tag-field3').addClass('is-invalid');
|
||||
return;
|
||||
}
|
||||
|
||||
(tag1.length > 0 ) ? save += (tag1 + "#") : this.set('tag1', '');
|
||||
(tag2.length > 0 && tag2 !== tag1) ? save += (tag2 + "#") : this.set('tag2', '');
|
||||
(tag3.length > 0 && tag3 !== tag1 && tag3 !== tag2) ? save += (tag3 + "#") : this.set('tag3', '');
|
||||
_.each(tagzToSave, (t) => {
|
||||
save += t;
|
||||
save += '#';
|
||||
});
|
||||
|
||||
let doc = this.get('document');
|
||||
doc.set('tags', save);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
import Model from 'ember-data/model';
|
||||
import attr from 'ember-data/attr';
|
||||
// import { belongsTo, hasMany } from 'ember-data/relationships';
|
||||
|
||||
export default Model.extend({
|
||||
title: attr('string'),
|
||||
|
|
@ -19,6 +18,7 @@ export default Model.extend({
|
|||
email: attr('string'),
|
||||
conversionEndpoint: attr('string'),
|
||||
allowAnonymousAccess: attr('boolean', { defaultValue: false }),
|
||||
maxTags: attr('number', {defaultValue: 3}),
|
||||
created: attr(),
|
||||
revised: attr()
|
||||
});
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ export default Service.extend({
|
|||
message: '',
|
||||
edition: 'Community',
|
||||
// for major.minor semver release detection
|
||||
// for bugfix releases, only admin is made aware of new release and end users see no Whats New messaging
|
||||
// for bugfix releases, only admin is made aware of new release and end users see no What's New messaging
|
||||
updateAvailable: false,
|
||||
valid: true,
|
||||
allowAnonymousAccess: false,
|
||||
|
|
@ -37,6 +37,7 @@ export default Service.extend({
|
|||
authConfig: null,
|
||||
setupMode: false,
|
||||
secureMode: false,
|
||||
maxTags: 3,
|
||||
|
||||
invalidLicense() {
|
||||
return this.valid === false;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ export default Service.extend({
|
|||
this.get('appMeta').setProperties({
|
||||
message: org.get('message'),
|
||||
title: org.get('title'),
|
||||
maxTags: org.get('maxTags'),
|
||||
conversionEndpoint: org.get('conversionEndpoint')
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -10,22 +10,22 @@
|
|||
<div class="view-customize">
|
||||
<form class="mt-5">
|
||||
<div class="form-group row">
|
||||
<label for="siteTitle" class="col-sm-2 col-form-label">Instance Name</label>
|
||||
<div class="col-sm-10">
|
||||
<label for="siteTitle" class="col-sm-4 col-form-label">Site Name</label>
|
||||
<div class="col-sm-7">
|
||||
{{focus-input id="siteTitle" type="text" value=model.general.title class=(if hasTitleInputError 'form-control is-invalid' 'form-control')}}
|
||||
<small class="form-text text-muted">Provide short title for this Documize instance</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label id="siteMessage" class="col-sm-2 col-form-label">Message</label>
|
||||
<div class="col-sm-10">
|
||||
<label id="siteMessage" class="col-sm-4 col-form-label">Site Message</label>
|
||||
<div class="col-sm-7">
|
||||
{{textarea id="siteMessage" rows="3" value=model.general.message class=(if hasMessageInputError 'form-control is-invalid' 'form-control')}}
|
||||
<small class="form-text text-muted">Provide short message explaining this Documize instance</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-2 col-form-label">Anonymous Access</label>
|
||||
<div class="col-sm-10">
|
||||
<label class="col-sm-4 col-form-label">Anonymous Access</label>
|
||||
<div class="col-sm-7">
|
||||
<div class="form-check">
|
||||
<input type="checkbox" class="form-check-input" id="allowAnonymousAccess" checked= {{model.general.allowAnonymousAccess}}
|
||||
/>
|
||||
|
|
@ -36,8 +36,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="conversionEndpoint" class="col-sm-2 col-form-label">Conversion Service URL</label>
|
||||
<div class="col-sm-10">
|
||||
<label for="conversionEndpoint" class="col-sm-4 col-form-label">Conversion Service URL</label>
|
||||
<div class="col-sm-7">
|
||||
{{input id="conversionEndpoint" type="text" value=model.general.conversionEndpoint class=(if hasConversionEndpointInputError 'form-control is-invalid' 'form-control')}}
|
||||
<small class="form-text text-muted">
|
||||
Endpoint for handling import/export (e.g. https://api.documize.com,
|
||||
|
|
@ -45,6 +45,22 @@
|
|||
</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn btn-success mt-4" {{action 'save'}}>Save</div>
|
||||
<div class="form-group row">
|
||||
<label for="maxTags" class="col-sm-4 col-form-label">Maximum Tags Per Document</label>
|
||||
<div class="col-sm-7">
|
||||
<select class="form-control" id="maxTags" {{action 'change' on='change'}}>
|
||||
<option selected={{is-equal 3 maxTags}} value=3>3</option>
|
||||
<option selected={{is-equal 4 maxTags}} value=4>4</option>
|
||||
<option selected={{is-equal 5 maxTags}} value=5>5</option>
|
||||
<option selected={{is-equal 6 maxTags}} value=6>6</option>
|
||||
<option selected={{is-equal 7 maxTags}} value=7>7</option>
|
||||
<option selected={{is-equal 8 maxTags}} value=8>8</option>
|
||||
<option selected={{is-equal 9 maxTags}} value=9>9</option>
|
||||
<option selected={{is-equal 10 maxTags}} value=10>10</option>
|
||||
</select>
|
||||
<small class="form-text text-muted">How many tags can be assigned to a document (between 3 and 10 tags)</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn btn-success font-weight-bold text-uppercase mt-4" {{action 'save'}}>Save</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -2,27 +2,17 @@
|
|||
<div class="explainer-header">Categories & Tags</div>
|
||||
<p class="explainer-text explainer-gap">Categorize your content, assign tags to suppliment</p>
|
||||
|
||||
<h1>Specify up to three tags</h1>
|
||||
<h1>Specify up to {{appMeta.maxTags}} tags</h1>
|
||||
<p class="form-text text-muted">Lowercase, characters, numbers, hyphens only</p>
|
||||
<form>
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">#</span>
|
||||
{{#each tagz as |tag|}}
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">#</span>
|
||||
</div>
|
||||
{{input type='text' id=(concat 'add-tag-field-' tag.number) class="form-control mousetrap tag-input" placeholder="Tag name" value=tag.value}}
|
||||
</div>
|
||||
{{input type='text' id='add-tag-field1' class="form-control mousetrap tag-input" placeholder="Tag name" value=tag1}}
|
||||
</div>
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">#</span>
|
||||
</div>
|
||||
{{input type='text' id='add-tag-field2' class="form-control mousetrap tag-input" placeholder="Tag name" value=tag2}}
|
||||
</div>
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">#</span>
|
||||
</div>
|
||||
{{input type='text' id='add-tag-field3' class="form-control mousetrap tag-input" placeholder="Tag name" value=tag3}}
|
||||
</div>
|
||||
{{/each}}
|
||||
</form>
|
||||
|
||||
<div class="mt-5" />
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
<td>{{x-toggle value=permission.spaceView onToggle=(action (mut permission.spaceView))}}</td>
|
||||
<td>{{x-toggle value=permission.spaceManage onToggle=(action (mut permission.spaceManage))}}</td>
|
||||
<td>{{x-toggle value=permission.spaceOwner onToggle=(action (mut permission.spaceOwner))}}</td>
|
||||
<td>{{x-toggle value=permission.documentAdd onToggle=(action (mut permission.spacdocumentAddView))}}</td>
|
||||
<td>{{x-toggle value=permission.documentAdd onToggle=(action (mut permission.documentAdd))}}</td>
|
||||
<td>{{x-toggle value=permission.documentEdit onToggle=(action (mut permission.documentEdit))}}</td>
|
||||
<td>{{x-toggle value=permission.documentDelete onToggle=(action (mut permission.documentDelete))}}</td>
|
||||
<td>{{x-toggle value=permission.documentMove onToggle=(action (mut permission.documentMove))}}</td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue