mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 14:32:22 +00:00
Merge branch 'norefresh_views' of https://github.com/synopsys-arc-oss/jenkins
This commit is contained in:
commit
a135dce245
4 files changed
+13
-5
No files matched your search
@@ -374,6 +374,15 @@ public abstract class View extends AbstractModelObject implements AccessControll
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enables or disables automatic refreshes of the view.
|
||||
* By default, automatic refreshes are enabled.
|
||||
* @since TODO: define a version
|
||||
*/
|
||||
public boolean isAutomaticRefreshEnabled() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* If true, only show relevant executors
|
||||
*/
|
||||
|
||||
@@ -24,7 +24,7 @@ THE SOFTWARE.
|
||||
|
||||
<?jelly escape-by-default='true'?>
|
||||
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
|
||||
<l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}">
|
||||
<l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}" norefresh="${!it.automaticRefreshEnabled}">
|
||||
<j:set var="view" value="${it}"/> <!-- expose view to the scripts we include from owner -->
|
||||
<st:include page="sidepanel.jelly" />
|
||||
<l:main-panel>
|
||||
|
||||
@@ -40,7 +40,7 @@ THE SOFTWARE.
|
||||
<div class="top-sticker noedge">
|
||||
<div class="top-sticker-inner">
|
||||
<div id="right-top-nav">
|
||||
<j:if test="${norefresh==null}">
|
||||
<j:if test="${norefresh==null or norefresh==false}">
|
||||
<div id="right-top-nav">
|
||||
<div class="smallfont">
|
||||
<j:choose>
|
||||
|
||||
@@ -34,7 +34,7 @@ THE SOFTWARE.
|
||||
Title of the HTML page. Rendered into <title> tag.
|
||||
</st:attribute>
|
||||
<st:attribute name="norefresh">
|
||||
If non-null, auto refresh is disabled on this page.
|
||||
If non-null and not "false", auto refresh is disabled on this page.
|
||||
This is necessary for pages that include forms.
|
||||
</st:attribute>
|
||||
<st:attribute name="css" deprecated="true">
|
||||
@@ -68,8 +68,7 @@ ${h.initPageVariables(context)}
|
||||
which I suspect can end up creating sessions for wrong resource types (such as static resources.)
|
||||
-->
|
||||
<j:set var="_" value="${request.getSession()}"/>
|
||||
<j:set var="_" value="${h.configureAutoRefresh(request, response, attrs.norefresh!=null)}"/>
|
||||
|
||||
<j:set var="_" value="${h.configureAutoRefresh(request, response, attrs.norefresh!=null and !attrs.norefresh.equals(false))}"/>
|
||||
<j:if test="${request.servletPath=='/' || request.servletPath==''}">
|
||||
${h.advertiseHeaders(response)}
|
||||
<j:forEach var="pd" items="${h.pageDecorators}">
|
||||
|
||||
Reference in new issue
Block a user