diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
| commit | 408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch) | |
| tree | 9726e6807e9cc0ca4b7603068f314a31a14349d1 /id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp | |
| parent | bb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff) | |
| parent | 719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff) | |
| download | moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.gz moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.bz2 moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.zip | |
merge SSO interfederation into Snapshot branch
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp index 113e822f8..e2af292d7 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -1,4 +1,5 @@ <%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%> +<%@page import="at.gv.egovernment.moa.id.configuration.data.OAListElement.ServiceType"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags" %> @@ -6,6 +7,11 @@ <s:if test="formOAs && formOAs.size > 0"> <div id="list_area"> <div id="listHeader" class="listElement"> + <s:if test="formOAs[0].serviceType != 'OA'"> + <div class="listElInfo"> + <%=LanguageHelper.getGUIString("webpages.listOAs.list.elInfo", request) %> + </div> + </s:if> <div class="listFirst"> <%=LanguageHelper.getGUIString("webpages.listOAs.list.first", request) %> </div> @@ -17,6 +23,11 @@ <s:iterator var="OAelement" value="formOAs"> <div class="listElement" onclick="editOA(<s:property value='dataBaseID'/>);"> + <s:if test="serviceType != 'OA'"> + <div class="listElInfo"> + <s:property value="serviceType"/> + </div> + </s:if> <div class="listFirst"> <s:property value="oaIdentifier"/> </div> @@ -28,7 +39,8 @@ </s:iterator> </div> - <s:form method="POST" id="selectOAForm" action="loadOA" namespace="/secure"> + <s:set var="myUrl">${param.editAction}</s:set> + <s:form method="POST" id="selectOAForm" action="%{#myUrl}" namespace="/secure"> <s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden> </s:form> </s:if> |