From 2548a7e99ce7c6f5b7379a44ec92be80a0adac3d Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 22 Sep 2011 15:37:49 -0400 Subject: Refined mirror federation feature. Documentation. HEAD is now properly reset if mirroring is enabled. Updated the federation pull status enum to include no change and mirrored states. --- src/com/gitblit/wicket/WicketUtils.java | 2 ++ src/com/gitblit/wicket/pages/FederationProposalPage.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/gitblit/wicket') diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index a6435d5a..1a24925b 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -115,6 +115,7 @@ public class WicketUtils { public static ContextImage getPullStatusImage(String wicketId, FederationPullStatus status) { String filename = null; switch (status) { + case MIRRORED: case PULLED: filename = "bullet_green.png"; break; @@ -128,6 +129,7 @@ public class WicketUtils { filename = "bullet_white.png"; break; case PENDING: + case NOCHANGE: default: filename = "bullet_black.png"; } diff --git a/src/com/gitblit/wicket/pages/FederationProposalPage.java b/src/com/gitblit/wicket/pages/FederationProposalPage.java index c2a2d24b..c4b13471 100644 --- a/src/com/gitblit/wicket/pages/FederationProposalPage.java +++ b/src/com/gitblit/wicket/pages/FederationProposalPage.java @@ -79,7 +79,7 @@ public class FederationProposalPage extends BasePage { sb.append(asParam(p, proposal.name, "frequency", GitBlit.getString(Keys.federation.defaultFrequency, "60 mins"))); sb.append(asParam(p, proposal.name, "folder", proposal.name)); - sb.append(asParam(p, proposal.name, "freeze", "true")); + sb.append(asParam(p, proposal.name, "mirror", "true")); sb.append(asParam(p, proposal.name, "sendStatus", "true")); sb.append(asParam(p, proposal.name, "notifyOnError", "true")); sb.append(asParam(p, proposal.name, "exclude", "")); -- cgit v1.2.3