diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-28 11:19:41 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-28 11:19:41 +0100 |
| commit | c51084cc2f9d374b51ea07ae287838b055b934a0 (patch) | |
| tree | a231e1596ba3caa64701cc7a1b874da4b9573983 | |
| parent | a949aceb20f55adad0dc797eba42c00f8d026fe1 (diff) | |
| parent | adaf1334197059c05bb6def6d7a12847aceb52c9 (diff) | |
| download | moa-id-spss-c51084cc2f9d374b51ea07ae287838b055b934a0.tar.gz moa-id-spss-c51084cc2f9d374b51ea07ae287838b055b934a0.tar.bz2 moa-id-spss-c51084cc2f9d374b51ea07ae287838b055b934a0.zip | |
Merge branch 'ap' into moa2_0_tlenz_bs_3
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java | 2 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 4 |
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 5fdbe1f77..929a3673c 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 @@ -149,7 +149,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> |