Skip to content

[JENKINS-54325] Add support for multiple footers in SimplePageDecorator #3721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
batmat merged 16 commits into from
Dec 12, 2018
Merged

[JENKINS-54325] Add support for multiple footers in SimplePageDecorator #3721

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
94076ad
[JENKINS-54325] Add support for multiple footers in SimplePageDecorator
jvz Nov 7, 2018
f79dbe5
Fix jelly variable usage
jvz Nov 15, 2018
4aaa6ff
Fix other jelly variable
jvz Nov 15, 2018
a23ce43
Disable frequently flaky test
jvz Nov 15, 2018
3d2d1dc
Add test retry logic
jvz Nov 15, 2018
a074194
Simplify expressions
jvz Nov 15, 2018
ce1c583
Revert "Simplify expressions"
jvz Nov 15, 2018
5638a11
Revert "Add test retry logic"
jvz Nov 15, 2018
f89df72
Merge branch 'master' into simple-footer-decorators
jvz Nov 15, 2018
19eb49a
Restart CI (1)
Wadeck Dec 2, 2018
24fe22d
Restart CI (2) (rollback previous change)
Wadeck Dec 2, 2018
578b622
Second ignore for flaky test
Wadeck Dec 3, 2018
451e086
Merge branch 'master' into simple-footer-decorators
jvz Dec 3, 2018
9a0699b
Force restart (1)
Wadeck Dec 10, 2018
744acc4
Force restart (2)
Wadeck Dec 10, 2018
4ad8019
One Ignore was already added by Baptiste in master
Wadeck Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/java/hudson/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,10 @@ public static SimplePageDecorator getSimplePageDecorator() {
return SimplePageDecorator.first();
}

public static List<SimplePageDecorator> getSimplePageDecorators() {
return SimplePageDecorator.all();
}

public static List<Descriptor<Cloud>> getCloudDescriptors() {
return Cloud.all();
}
Expand Down
20 changes: 13 additions & 7 deletions core/src/main/java/jenkins/model/SimplePageDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
*/
package jenkins.model;

import hudson.DescriptorExtensionList;
import hudson.ExtensionPoint;
import hudson.model.Describable;
import hudson.model.Descriptor;

import java.util.List;

/**
* Participates in the rendering of the login page
*
Expand Down Expand Up @@ -56,17 +58,21 @@ public final String getUrl() {
return "descriptor/"+clazz.getName();
}

/**
* Returns all login page decorators.
* @since TODO
*/
public static List<SimplePageDecorator> all() {
return Jenkins.get().getDescriptorList(SimplePageDecorator.class);
}

/**
* The first found LoginDecarator, there can only be one.
* @return the first found {@link SimplePageDecorator}
*/
public static SimplePageDecorator first(){
DescriptorExtensionList<SimplePageDecorator, SimplePageDecorator> descriptorList = Jenkins.getInstanceOrNull().<SimplePageDecorator, SimplePageDecorator>getDescriptorList(SimplePageDecorator.class);
if (descriptorList.size() >= 1) {
return descriptorList.get(0);
} else {
return null;
}
List<SimplePageDecorator> decorators = all();
return decorators.isEmpty() ? null : decorators.get(0);
}

}
6 changes: 6 additions & 0 deletions core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ THE SOFTWARE.
<!-- in case of error we want to surround the form elements with an error hint -->
<j:set var="inputClass" value="${data.errorMessage!=null ? 'danger' : 'normal'}"/>
<j:set var="simpleDecorator" value="${h.simplePageDecorator}"/>
<j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
<html lang="${request.getLocale().toLanguageTag()}">
<head data-rooturl="${rootURL}" data-resurl="${resURL}" resURL="${resURL}">
<title>${%Create an account! [Jenkins]}</title>
Expand Down Expand Up @@ -292,6 +293,11 @@ THE SOFTWARE.
}
</script>
</j:if>
<div class="footer">
<j:forEach var="decorator" items="${simpleDecorators}">
<st:include it="${decorator}" page="simple-footer.jelly" optional="true"/>
</j:forEach>
</div>
</form>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/resources/jenkins/model/Jenkins/login.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ THE SOFTWARE.
<!-- in case of error we want to surround the form elements with an error hint -->
<j:set var="inputClass" value="${error ? 'danger' : 'normal'}"/>
<j:set var="simpleDecorator" value="${h.simplePageDecorator}"/>
<j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
<!-- real deal starting here -->
<html lang="${request.getLocale().toLanguageTag()}">
<head data-rooturl="${rootURL}" data-resurl="${resURL}" resURL="${resURL}">
Expand Down Expand Up @@ -145,8 +146,9 @@ THE SOFTWARE.
</j:forEach>

<div class="footer">

<st:include it="${simpleDecorator}" page="simple-footer.jelly" optional="true"/>
<j:forEach var="decorator" items="${simpleDecorators}">
<st:include it="${decorator}" page="simple-footer.jelly" optional="true"/>
</j:forEach>
</div>

</div>
Expand Down
2 changes: 2 additions & 0 deletions core/src/test/java/hudson/UtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;

Expand Down Expand Up @@ -352,6 +353,7 @@ public void testDeleteContentsRecursive() throws Exception {
}

@Test
@Ignore("Frequently flaky test")
public void testDeleteContentsRecursive_onWindows() throws Exception {
Assume.assumeTrue(Functions.isWindows());
final File dir = tmp.newFolder();
Expand Down