nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-534 Rename lookup configuration property

This commit is contained in:
Martin Rojas Miguel Angel 2018-06-06 14:42:29 +02:00 committed by Holger Hagen
parent 5b926153a7
commit d6942737bf
9 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/taskana-rest-spring-example/src/main/resources/application.properties
View File

@ -5,7 +5,7 @@ datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE SCHEM
datasource.driverClassName=org.h2.Driver
datasource.username=sa
datasource.password=sa
devMode=false
devMode=true
####### control LDAP usage
taskana.ldap.useLdap=false
####### properties to connect to LDAP

8
rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/customized-fields.json
View File

@ -2,8 +2,8 @@
"EN": {
"workbaskets": {
"information": {
"lookupField": {
"visible": false
"owner": {
"lookupField": true
},
"custom1": {
"field": "Customized field 1 title",
@ -15,8 +15,8 @@
}
},
"access-items": {
"lookupField": {
"visible": true
"accessId": {
"lookupField": true
},
"custom3": {
"field": "",

2
web/src/app/administration/workbasket/details/access-items/access-items.component.html
View File

@ -42,7 +42,7 @@
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</button>
</td>
<td *ngIf="lookupField.visible else accessIdInput" class="input-group text-align text-width taskana-type-ahead" [ngClass]="{
<td *ngIf="accessIdField.lookupField else accessIdInput" class="input-group text-align text-width taskana-type-ahead" [ngClass]="{
'has-warning': (accessItemsClone[index].accessId !== accessItem.accessId),
'has-error': !accessItem.accessId } ">
<taskana-type-ahead required #accessItemName="ngModel" [(ngModel)]="accessItem.accessId" name="accessItem.accessId-{{index}}"

2
web/src/app/administration/workbasket/details/access-items/access-items.component.ts
View File

@ -34,7 +34,7 @@ export class AccessItemsComponent implements OnChanges, OnDestroy {
active: string;
badgeMessage = '';
lookupField = this.customFieldService.getCustomField('Owner', 'workbaskets.access-items.lookupField');
accessIdField = this.customFieldService.getCustomField('Owner', 'workbaskets.access-items.accessId');
custom1Field = this.customFieldService.getCustomField('Custom 1', 'workbaskets.access-items.custom1');
custom2Field = this.customFieldService.getCustomField('Custom 2', 'workbaskets.access-items.custom2');
custom3Field = this.customFieldService.getCustomField('Custom 3', 'workbaskets.access-items.custom3');

2
web/src/app/administration/workbasket/details/information/workbasket-information.component.html
View File

@ -39,7 +39,7 @@
</div>
<div class="form-group required">
<label for="wb-owner" class="control-label">Owner</label>
<taskana-type-ahead *ngIf="lookupField.visible else ownerInput" required #owner="ngModel" name="owner" [(ngModel)]="workbasket.owner"
<taskana-type-ahead *ngIf="ownerField.lookupField else ownerInput" required #owner="ngModel" name="owner" [(ngModel)]="workbasket.owner"
placeHolderMessage="Owner is required"></taskana-type-ahead>
<ng-template #ownerInput>
<input type="text" required #owner="ngModel" class="form-control" id="wb-owner" placeholder="Owner" [(ngModel)]="workbasket.owner"

2
web/src/app/administration/workbasket/details/information/workbasket-information.component.ts
View File

@ -37,7 +37,7 @@ export class WorkbasketInformationComponent implements OnInit, OnChanges, OnDest
requestInProgress = false;
badgeMessage = '';
lookupField = this.customFieldsService.getCustomField('Owner', 'workbaskets.information.lookupField');
ownerField = this.customFieldsService.getCustomField('Owner', 'workbaskets.information.owner');
custom1Field = this.customFieldsService.getCustomField('Custom 1', 'workbaskets.information.custom1');
custom2Field = this.customFieldsService.getCustomField('Custom 2', 'workbaskets.information.custom2');
custom3Field = this.customFieldsService.getCustomField('Custom 3', 'workbaskets.information.custom3');

2
web/src/app/shared/type-ahead/type-ahead.component.html
View File

@ -20,7 +20,7 @@
<div>{{dataSource.selected?.name}}</div>
</div>
<div [ngClass]="{'hidden': dataSource.selected && !typing}">
<span class="field-label-wrapper">
<span class="field-label-wrapper">
<label>
{{dataSource.selected?.name}}
</label>

5
web/src/app/shared/type-ahead/type-ahead.component.scss
View File

@ -11,6 +11,11 @@ $grey: #ddd;
border-bottom: 1px solid $grey;
margin-top:6px;
}
> div{
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
.input-text {

8
web/src/environments/data-sources/customized-fields.json
View File

@ -2,8 +2,8 @@
"EN": {
"workbaskets": {
"information": {
"lookupField": {
"visible": true
"owner": {
"lookupField": true
},
"custom1": {
"field": "Customized field 1 title",
@ -15,8 +15,8 @@
}
},
"access-items": {
"lookupField": {
"visible": false
"accessId": {
"lookupField": true
},
"custom3": {
"field": "",