parent
43ab6c13f4
commit
7568bc4839
|
|
@ -109,8 +109,21 @@ public class SettingsController {
|
|||
.sorted()
|
||||
.collect(Collectors.toList());
|
||||
|
||||
models.put("configurationClass", configurationClass);
|
||||
|
||||
models.put("settings", settings);
|
||||
|
||||
models.put("BigDecimalClassName", BigDecimal.class.getName());
|
||||
models.put("BooleanClassName", Boolean.class.getName());
|
||||
models.put("DoubleClassName", Double.class.getName());
|
||||
models.put("FloatClassName", Float.class.getName());
|
||||
models.put("IntegerClassName", Integer.class.getName());
|
||||
models.put("ListClassName", List.class.getName());
|
||||
models.put("LongClassName", Long.class.getName());
|
||||
models.put("LocalizedStringClassName", LocalizedString.class.getName());
|
||||
models.put("SetClassName", Set.class.getName());
|
||||
models.put("StringClassName", String.class.getName());
|
||||
|
||||
return "org/libreccm/ui/admin/configuration/settings.xhtml";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
|
||||
<ui:param name="activePage" value="configuration" />
|
||||
<ui:param name="title"
|
||||
value="#{AdminMessages('configuration.setting.not_found.title')}" />
|
||||
value="#{AdminMessages['configuration.setting.not_found.title']}" />
|
||||
|
||||
<ui:define name="breadcrumb">
|
||||
<ui:define name="breadcrumb">
|
||||
|
|
|
|||
|
|
@ -132,7 +132,9 @@
|
|||
id="setting-#{setting.name}-edit-dialog"
|
||||
tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<form action="#{mvc.uri('SettingsController#updateSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name})}"
|
||||
class="modal-content"
|
||||
method="post">
|
||||
<div class="modal-header">
|
||||
<h2 class="model-title"
|
||||
id="setting-#{setting.name}-edit-dialog">
|
||||
|
|
@ -144,42 +146,59 @@
|
|||
type="button"><span aria-hidden="true">×</span></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form action="#">
|
||||
<c:choose>
|
||||
<c:when test="#{setting.valueType == BigDecimal.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(BigDecimalClassName)}">
|
||||
<pre>BigDecimal</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == Boolean.class.getName()}">
|
||||
<pre>Boolean</pre>
|
||||
<c:when test="#{setting.valueType.equals(BooleanClassName)}">
|
||||
<div class="form-group form-check">
|
||||
<input aria-describedby="#{setting.name}-setting-value-help"
|
||||
class="form-check-input"
|
||||
id="#{setting.name}-setting-value"
|
||||
name="settingValue"
|
||||
type="checkbox" />
|
||||
<label class="form-check-label"
|
||||
for="#{setting.name}-setting-value">
|
||||
#{AdminMessages['configuration.settings.setting.dialog.value.label']}
|
||||
</label>
|
||||
<small class="form-text text-muted"
|
||||
id="#{setting.name}-setting-value-help">
|
||||
#{setting.description}
|
||||
</small>
|
||||
</div>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == Double.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(DoubleClassName)}">
|
||||
<pre>Double</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == Integer.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(IntegerClassName)}">
|
||||
<pre>Integer</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == "int"}">
|
||||
<c:when test="#{setting.valueType.equals('int')}">
|
||||
<pre>int</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == List.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(ListClassName)}">
|
||||
<pre>List</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == org.libreccm.l10n.LocalizedString.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(LocalizedStringClassName)}">
|
||||
<pre>LocalizedString</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == Set.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(SetClassName)}">
|
||||
<pre>Set</pre>
|
||||
</c:when>
|
||||
<c:when test="#{setting.valueType == String.class.getName()}">
|
||||
<c:when test="#{setting.valueType.equals(StringClassName)}">
|
||||
<pre>String</pre>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p>
|
||||
#{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
|
||||
</p>
|
||||
<pre>
|
||||
setting.valueType: #{setting.valueType}
|
||||
Boolean: #{BooleanClassName}
|
||||
LocalizedString: #{LocalizedStringClassName}
|
||||
</pre>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-danger"
|
||||
|
|
@ -188,12 +207,11 @@
|
|||
#{AdminMessages['configuration.settings.setting.dialog.close']}
|
||||
</button>
|
||||
<button class="btn btn-success"
|
||||
data-dismiss="modal"
|
||||
type="button">
|
||||
type="submit">
|
||||
#{AdminMessages['configuration.settings.setting.dialog.save']}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
|
|||
configuration.setting.invalid_type.message=Setting {1} of configuration class {0} is of type {2} but the value {3} can be converted into this type
|
||||
configuration.setting.not_found.title=Setting not found
|
||||
configuration.setting.not_found.message=Setting {1} of type {2} not found in configuration class {0}
|
||||
configuration.settings.setting.dialog.value.label=Value
|
||||
|
|
|
|||
|
|
@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
|
|||
configuration.setting.invalid_type.message=Einstellung {1} der Konfigurations-Klasse {0} ist vom Typ {2}, der angegebene Wert {3} kann aber nicht in diesen Typ konvertiert werden
|
||||
configuration.setting.not_found.title=Einstellung nicht gefunden
|
||||
configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {3} in Konfiguration {0} gefunden
|
||||
configuration.settings.setting.dialog.value.label=Wert
|
||||
|
|
|
|||
Loading…
Reference in New Issue