diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-01-24 08:04:12 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-01-24 08:04:12 +0100 |
| commit | 1f46df486fbab558fb3e935dfed160f26e698ac0 (patch) | |
| tree | 43cef10cdba0c1bcbfb5b7658661ac4144063540 /id/ConfigWebTool/src/main | |
| parent | 9eb81a78755db5c9735d2a43ee91fb11ce62e58e (diff) | |
| download | moa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.tar.gz moa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.tar.bz2 moa-id-spss-1f46df486fbab558fb3e935dfed160f26e698ac0.zip | |
-- Solve merge problems (AuthnRequestHandler.java & mandateReferenceValueAttributeBuilder)
-- Change sessionmanagement betweem AuthAction and TokenAction to AssertionStorage class
-- add class definieten to HTML config element
Diffstat (limited to 'id/ConfigWebTool/src/main')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java | 7 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java index 6b30c0cfa..e50515326 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java @@ -206,11 +206,8 @@ public class ConfigurationProvider { } public boolean isPVP2LoginActive() { - if (!pvp2logininitialzied) - return false; - - String result = props.getProperty("general.login.pvp2.isactive", "false"); - return Boolean.parseBoolean(result); + + return Boolean.parseBoolean(props.getProperty("general.login.pvp2.isactive", "false")); } public boolean isPVP2LoginBusinessService() { diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index 0341fc49b..97f0d01c2 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -415,7 +415,8 @@ <s:textfield name="oauth20OA.redirectUri" value="%{oauth20OA.redirectUri}" labelposition="left" - key="webpages.oaconfig.oauth20.redirectUri"> + key="webpages.oaconfig.oauth20.redirectUri" + cssClass="textfield_long"> </s:textfield> </div> </div> |