inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tab form service (#2293)

Browse Source
This commit is contained in:
Eugenio Romano 2017-09-05 00:10:05 +02:00 committed by Mario Romano
parent f6db06a585
commit a11fb3afb9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo-shell-ng2/app/components/form/form-list-demo.component.ts
View File

@ -25,8 +25,8 @@ import { ActivitiForm } from 'ng2-activiti-form';
<adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)"> <adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
</adf-form-list> </adf-form-list>
<div class="form-container" *ngIf="!isEmptyForm()"> <div class="form-container" *ngIf="!isEmptyForm()">
<activiti-form [form]="form" [data]="restoredData"> <adf-form [form]="form" [data]="restoredData">
</activiti-form> </adf-form>
</div> </div>
<button md-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button> <button md-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
<button md-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button> <button md-button (click)="restore()" color="primary">{{'FORM-LIST.RESTORE' | translate }}</button>

2
ng2-components/ng2-activiti-form/src/services/form.service.ts
View File

@ -82,7 +82,7 @@ export class FormService {
parseForm(json: any, data?: FormValues, readOnly: boolean = false): FormModel { parseForm(json: any, data?: FormValues, readOnly: boolean = false): FormModel {
if (json) { if (json) {
let form = new FormModel(json, data, readOnly, this); let form = new FormModel(json.formDefinition, data, readOnly, this);
if (!json.fields) { if (!json.fields) {
form.outcomes = [ form.outcomes = [
new FormOutcomeModel(form, { new FormOutcomeModel(form, {