mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
omit sidepanel on always-accessible pages if user doesn't have app.READ permission,
as done for login page in r33566 git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33567 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
d5be096492
commit
dd45fb64bf
4 files changed
+20
-12
No files matched your search
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
The MIT License
|
||||
|
||||
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Matthew R. Harrah
|
||||
Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Matthew R. Harrah
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -33,7 +33,9 @@ THE SOFTWARE.
|
||||
-->
|
||||
<st:statusCode value="401" />
|
||||
<l:layout title="${%Login Error}">
|
||||
<st:include page="sidepanel.jelly" />
|
||||
<l:hasPermission permission="${app.READ}">
|
||||
<st:include page="sidepanel.jelly" />
|
||||
</l:hasPermission>
|
||||
<l:main-panel>
|
||||
<div style="margin: 2em; text-align:center; color:red; font-weight:bold">
|
||||
${%Invalid login information. Please try again.}
|
||||
@@ -52,4 +54,4 @@ THE SOFTWARE.
|
||||
<st:redirect url="." />
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:jelly>
|
||||
</j:jelly>
|
||||
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
The MIT License
|
||||
|
||||
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
|
||||
Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -25,7 +25,9 @@ THE SOFTWARE.
|
||||
<!-- show debug information about the current user -->
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
|
||||
<l:layout>
|
||||
<st:include page="sidepanel.jelly" />
|
||||
<l:hasPermission permission="${app.READ}">
|
||||
<st:include page="sidepanel.jelly" />
|
||||
</l:hasPermission>
|
||||
<l:main-panel>
|
||||
<j:set var="auth" value="${app.authentication}" />
|
||||
<h1>Who Am I?</h1>
|
||||
@@ -68,4 +70,4 @@ THE SOFTWARE.
|
||||
</table>
|
||||
</l:main-panel>
|
||||
</l:layout>
|
||||
</j:jelly>
|
||||
</j:jelly>
|
||||
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
The MIT License
|
||||
|
||||
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
|
||||
Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -33,7 +33,9 @@ THE SOFTWARE.
|
||||
}
|
||||
</style>
|
||||
</l:header>
|
||||
<st:include page="sidepanel.jelly" it="${host}" />
|
||||
<l:hasPermission permission="${app.READ}" it="${host}">
|
||||
<st:include page="sidepanel.jelly" it="${host}" />
|
||||
</l:hasPermission>
|
||||
<l:main-panel>
|
||||
<h1>${title}</h1>
|
||||
<div style="margin: 2em;">
|
||||
@@ -82,4 +84,4 @@ THE SOFTWARE.
|
||||
</div>
|
||||
</l:main-panel>
|
||||
</l:layout>
|
||||
</j:jelly>
|
||||
</j:jelly>
|
||||
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
The MIT License
|
||||
|
||||
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
|
||||
Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
@@ -24,7 +24,9 @@ THE SOFTWARE.
|
||||
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
|
||||
<l:layout norefresh="true">
|
||||
<st:include page="sidepanel.jelly" it="${app}" />
|
||||
<l:hasPermission permission="${app.READ}" it="${app}">
|
||||
<st:include page="sidepanel.jelly" it="${app}" />
|
||||
</l:hasPermission>
|
||||
<l:main-panel>
|
||||
<h1>${%Success}</h1>
|
||||
<div>
|
||||
@@ -32,4 +34,4 @@ THE SOFTWARE.
|
||||
</div>
|
||||
</l:main-panel>
|
||||
</l:layout>
|
||||
</j:jelly>
|
||||
</j:jelly>
|
||||
Reference in new issue
Block a user