inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1327 do not call server when dropdown are not rest (#1328)

Browse Source
This commit is contained in:
Mario Romano
2016-12-19 16:39:05 +00:00
committed by Eugenio Romano
parent 72ae760b85
commit ea7df8ac22
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts
View File

@@ -205,6 +205,7 @@ describe('DisplayValueWidget', () => {
it('should setup [DROPDOWN] field with REST config', () => { it('should setup [DROPDOWN] field with REST config', () => {
widget.field = new FormFieldModel(null, { widget.field = new FormFieldModel(null, {
type: FormFieldTypes.DISPLAY_VALUE, type: FormFieldTypes.DISPLAY_VALUE,
restUrl: 'http://test.com',
params: { params: {
field: { field: {
type: FormFieldTypes.DROPDOWN type: FormFieldTypes.DROPDOWN

5
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts
View File

@@ -96,7 +96,11 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
this.loadRestFieldValue(); this.loadRestFieldValue();
break; break;
case FormFieldTypes.DROPDOWN: case FormFieldTypes.DROPDOWN:
if (this.field.restUrl) {
this.loadRestFieldValue(); this.loadRestFieldValue();
} else {
this.value = this.field.value;
}
break; break;
case FormFieldTypes.RADIO_BUTTONS: case FormFieldTypes.RADIO_BUTTONS:
if (this.field.restUrl) { if (this.field.restUrl) {
@@ -207,6 +211,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
} }
getCellValue(row: DynamicTableRow, column: DynamicTableColumn): any { getCellValue(row: DynamicTableRow, column: DynamicTableColumn): any {
let result = row.value[column.id]; let result = row.value[column.id];
if (column.type === 'Dropdown') { if (column.type === 'Dropdown') {