Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git Conflicts: hsarweb/src/de/hsadmin/web/AbstractModule.java
This commit is contained in:
commit
8b9e266f5a
@ -57,7 +57,7 @@
|
||||
</init-param>
|
||||
</filter>
|
||||
|
||||
|
||||
<!--
|
||||
<filter-mapping>
|
||||
<filter-name>CAS Validation Filter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@ -67,7 +67,7 @@
|
||||
<filter-name>CAS Authentication Filter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
-->
|
||||
<servlet>
|
||||
<servlet-name>Logout Servlet</servlet-name>
|
||||
<servlet-class>de.hsadmin.logout.LogoutServlet</servlet-class>
|
||||
|
@ -130,7 +130,7 @@ public abstract class AbstractModule implements Module, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@Override
|
||||
public void buttonClick(ClickEvent event) {
|
||||
ExternalResource logoutLink = new ExternalResource("/hasrweb/logout");
|
||||
ExternalResource logoutLink = new ExternalResource("/hsarweb/logout");
|
||||
application.getMainWindow().open(logoutLink);
|
||||
}
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user