aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-28 11:19:13 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-28 11:19:13 +0100
commitadaf1334197059c05bb6def6d7a12847aceb52c9 (patch)
treeb2c9d8adfc383daec1597b80d6f13d78ec1cb140
parente9825935e59a3e7855060531f228177aded5cb0a (diff)
parent9e830fb8f4aa758f0855ab422d398fa8bb0db32d (diff)
downloadmoa-id-spss-adaf1334197059c05bb6def6d7a12847aceb52c9.tar.gz
moa-id-spss-adaf1334197059c05bb6def6d7a12847aceb52c9.tar.bz2
moa-id-spss-adaf1334197059c05bb6def6d7a12847aceb52c9.zip
Merge branch 'ap' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into ap
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java2
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp4
2 files changed, 3 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 430bafbf5..9a65e4ab5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -143,7 +143,7 @@ public class OASTORKConfig {
* VIDP settings below
*/
private boolean vidpEnabled = false;
- private List<AttributeProviderPlugin> attributeProviderPlugins;
+ private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
public List<String> getAvailableAttributeProviderPlugins() {
return AttributeProviderFactory.getAvailablePlugins();
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 7887d9d62..1f42bf092 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -505,7 +505,7 @@
</div>
- <div id="oa_vidp_area" class="oa_protocol_area">
+ <div id="oa_vidp_area" class="oa_protocol_area hidden">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
<p><s:checkbox name="storkOA.vidpEnabled"
@@ -518,7 +518,7 @@
<table id="stork_aplist">
<tr><th>AP Plugin</th><th>URL</th>
<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
- <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin" value="%{plugin}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+ <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
<td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
<td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
</s:iterator>