vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

#65: Limit vocabulary values to 500 characters

Browse Source
This commit is contained in:
jendib 2016-02-14 23:11:24 +01:00
parent f9c3715d8d
commit 2d858e6e11
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-core/src/main/java/com/sismics/docs/core/model/jpa/Vocabulary.java
View File

@ -31,7 +31,7 @@ public class Vocabulary {
/**
* Vocabulary value.
*/
@Column(name = "VOC_VALUE_C", nullable = false, length = 100)
@Column(name = "VOC_VALUE_C", nullable = false, length = 500)
private String value;
/**

8
docs-core/src/main/resources/db/update/dbupdate-006-0.sql
View File

@ -3,10 +3,10 @@ alter table T_DOCUMENT add column DOC_IDENTIFIER_C varchar(500);
alter table T_DOCUMENT add column DOC_PUBLISHER_C varchar(500);
alter table T_DOCUMENT add column DOC_FORMAT_C varchar(500);
alter table T_DOCUMENT add column DOC_SOURCE_C varchar(500);
alter table T_DOCUMENT add column DOC_TYPE_C varchar(100);
alter table T_DOCUMENT add column DOC_COVERAGE_C varchar(100);
alter table T_DOCUMENT add column DOC_RIGHTS_C varchar(100);
create memory table T_VOCABULARY ( VOC_ID_C varchar(36) not null, VOC_NAME_C varchar(50) not null, VOC_VALUE_C varchar(100) not null, VOC_ORDER_N int not null, primary key (VOC_ID_C) );
alter table T_DOCUMENT add column DOC_TYPE_C varchar(500);
alter table T_DOCUMENT add column DOC_COVERAGE_C varchar(500);
alter table T_DOCUMENT add column DOC_RIGHTS_C varchar(500);
create memory table T_VOCABULARY ( VOC_ID_C varchar(36) not null, VOC_NAME_C varchar(50) not null, VOC_VALUE_C varchar(500) not null, VOC_ORDER_N int not null, primary key (VOC_ID_C) );
insert into T_VOCABULARY(VOC_ID_C, VOC_NAME_C, VOC_VALUE_C, VOC_ORDER_N) values('type-collection', 'type', 'Collection', 0);
insert into T_VOCABULARY(VOC_ID_C, VOC_NAME_C, VOC_VALUE_C, VOC_ORDER_N) values('type-dataset', 'type', 'Dataset', 1);

4
docs-web/src/main/java/com/sismics/docs/rest/resource/VocabularyResource.java
View File

@ -73,7 +73,7 @@ public class VocabularyResource extends BaseResource {
// Validate input data
name = ValidationUtil.validateLength(name, "name", 1, 50, false);
ValidationUtil.validateRegex(name, "name", "[a-z0-9\\-]+");
value = ValidationUtil.validateLength(value, "value", 1, 100, false);
value = ValidationUtil.validateLength(value, "value", 1, 500, false);
Integer order = ValidationUtil.validateInteger(orderStr, "order");
// Create the vocabulary
@ -117,7 +117,7 @@ public class VocabularyResource extends BaseResource {
if (name != null) {
ValidationUtil.validateRegex(name, "name", "[a-z0-9\\-]+");
}
value = ValidationUtil.validateLength(value, "value", 1, 100, true);
value = ValidationUtil.validateLength(value, "value", 1, 500, true);
Integer order = null;
if (orderStr != null) {
order = ValidationUtil.validateInteger(orderStr, "order");

4
docs-web/src/main/webapp/src/partial/docs/settings.vocabulary.html
View File

@ -23,7 +23,7 @@
<tbody>
<tr class="info">
<td>
<input type="text" placeholder="New entry" class="form-control" ng-model="entry.value" maxlength="100" />
<input type="text" placeholder="New entry" class="form-control" ng-model="entry.value" maxlength="500" />
</td>
<td>
<input type="number" class="form-control" ng-model="entry.order" />
@ -37,7 +37,7 @@
</tr>
<tr ng-repeat="entry in entries | orderBy: 'order'">
<td>
<input type="text" class="form-control" ng-model="entry.value" maxlength="100" ng-blur="updateEntry(entry)" />
<input type="text" class="form-control" ng-model="entry.value" maxlength="500" ng-blur="updateEntry(entry)" />
</td>
<td>
<input type="number" class="form-control" ng-model="entry.order" ng-blur="updateEntry(entry)" />