From a6e1ace2b6bdba8c08a4acfa42433f3ac073b747 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 21 Mar 2017 10:16:22 +0000
Subject: [PATCH] #3527 feature - Added all catalogs and working fine
---
securis/src/main/webapp/src/app/forms/licensetype.form.html | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/licensetype.form.html b/securis/src/main/webapp/src/app/forms/licensetype.form.html
index 6299a7c..1e64b6f 100644
--- a/securis/src/main/webapp/src/app/forms/licensetype.form.html
+++ b/securis/src/main/webapp/src/app/forms/licensetype.form.html
@@ -31,8 +31,8 @@
<form #form="ngForm" class="inset">
<div layout="column" layout-align="start center">
<div layout="row" layout-fill layout-padding>
- <field-readonly [value]="data.id" label="field.id" flex="15" *ngIf="!isNew"></field-readonly>
- <div layout="column" layout-fill flex>
+ <field-readonly [value]="data.id" label="field.id" flex="10" *ngIf="!isNew"></field-readonly>
+ <div layout="column" layout-fill flex="30">
<md-input-container>
<input #firstField mdInput maxLength="50" type="text" [(ngModel)]="data.code" name="code" required [readonly]="!isNew" />
<md-placeholder>
@@ -41,8 +41,6 @@
</md-input-container>
<error-checker [fieldName]="getFieldName('code')" [formField]="form.controls.code"></error-checker>
</div>
- </div>
- <div layout="row" layout-fill layout-padding>
<div layout="column" layout-fill flex>
<md-input-container flex>
<input mdInput type="text" [(ngModel)]="data.name" name="name" required />
@@ -51,15 +49,6 @@
</md-placeholder>
</md-input-container>
<error-checker [fieldName]="getFieldName('name')" [formField]="form.controls.name"></error-checker>
- </div>
- <div layout="column" layout-fill flex>
- <md-input-container flex>
- <input mdInput type="text" [(ngModel)]="data.license_filename" name="license_filename" required />
- <md-placeholder>
- <span i18n="field.license_filename"></span>
- </md-placeholder>
- </md-input-container>
- <error-checker [fieldName]="getFieldName('license_filename')" [formField]="form.controls.license_filename"></error-checker>
</div>
</div>
<div layout="row" layout-fill layout-padding>
@@ -73,10 +62,21 @@
</md-input-container>
</div>
</div>
+ <div layout="row" layout-fill layout-padding >
+ <div layout="column" layout-fill flex>
+ <md-select [placeholder]="getFieldName('application_id')" flex [(ngModel)]="data.application_id" name="application_id"
+ (change)="changeApplication($event)">
+ <md-option *ngFor="let org of allApplications" [value]="org.id">
+ {{org.label}}
+ </md-option>
+ </md-select>
+ <error-checker [fieldName]="getFieldName('application_id')" [formField]="form.controls.application_id"></error-checker>
+ </div>
+ </div>
<div layout="row" layout-fill layout-padding *ngIf="!isNew">
<field-readonly [value]="data.creation_timestamp | date: 'medium'" label="field.creation_timestamp" flex></field-readonly>
</div>
- <metadata-manager addOrDelete="true" editKeys="true" [metadata]="data.metadata" ></metadata-manager>
+ <metadata-manager [addOrDelete]="false" [editKeys]="false" [metadata]="data.metadata" ></metadata-manager>
</div>
</form>
</md-card-content>
--
Gitblit v1.3.2