From 7686a892d556333194349f73fee3a268b6202d66 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 15 Oct 2014 16:52:56 +0000
Subject: [PATCH] #2021 config - Fixed some catalogs, LicenseType and Users
---
securis/src/main/resources/static/admin.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/resources/static/admin.html b/securis/src/main/resources/static/admin.html
index 4782cff..789ecde 100644
--- a/securis/src/main/resources/static/admin.html
+++ b/securis/src/main/resources/static/admin.html
@@ -47,13 +47,15 @@
<div ng-switch on="inputType(field)">
<input catalog-field ng-switch-when="normal" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
class="form-control" ng-model="formu[field.name]" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}" />
+ <input catalog-field ng-switch-when="password" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
+ class="form-control" ng-model="formu[field.name]" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}" />
<textarea catalog-field ng-switch-when="textarea" type="{{field.type}}" id="{{field.name}}" name="{{field.name}}" placeholder=""
class="form-control" ng-model="formu[field.name]" rows="{{field.multiline}}" ng-required="field.mandatory" ng-maxlength="{{field.maxlength}}"></textarea>
<p ng-switch-when="readonly" class="form-control-static">{{formu[field.name]}}</p>
<p ng-switch-when="readonly_date" class="form-control-static">{{formu[field.name] | date:'medium'}}</p>
<select ng-switch-when="select" class="form-control" ng-required="field.mandatory" ng-model="formu[field.name]"
ng-options="o.id as o.label for o in refs[field.name]" ng-change="selectFieldChanged(field.onchange)">
- <option value="-1" selected></option>
+ <option value="" ></option>
</select>
<select chosen multiple ng-switch-when="multiselect" class="form-control" ng-required="field.mandatory" ng-model="formu[field.name]"
ng-options="o.id as o.label for o in refs[field.name]" data-placeholder="...">
@@ -75,10 +77,10 @@
</td>
<td>
<input type="text" id="md_value" name="md_value" placeholder=""
- class="form-control" ng-model="row_md['value']" ng-required="false" ng-maxlength="150" />
+ class="form-control" ng-model="row_md['value']" ng-required="row_md['mandatory']" ng-maxlength="150" />
</td>
<td>
- <input type="checkbox" id="md_mandatory" name="md_mandatory"
+ <input type="checkbox" id="md_mandatory" name="md_mandatory" ng-disabled="!field.allow_creation"
class="form-control" ng-model="row_md['mandatory']" />
</td>
<td ng-if="field.allow_creation">
@@ -88,8 +90,7 @@
</tbody>
</table>
</div>
-
-
+
</div>
<div class="alert inline-alert alert-warning" ng-show="catalogForm[field.name].$invalid">
<span class="glyphicon glyphicon-warning-sign"></span>
--
Gitblit v1.3.2