The Unified and Autonomous Development Platform
Refactor commit subscription button
Robin Shen16bc07395875
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.javaindex d46224dd2b..03a196c216 100644--- a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java@@ -1,55 +1,36 @@package io.onedev.server.web.component.subscriptionstatus;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.model.LoadableDetachableModel;--import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;@SuppressWarnings("serial")-public abstract class SubscriptionStatusLink extends DropdownLink {+public abstract class SubscriptionStatusLink extends AjaxLink<Void> {public SubscriptionStatusLink(String id) {super(id);}@Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (getSubscriptionStatus())- return "subscribed";- else- return "not-subscribed";- }-- }));-+ public void onClick(AjaxRequestTarget target) {+ onSubscriptionStatusChange(target, !isSubscribed());}@Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new SubscriptionStatusPanel(id) {-- @Override- protected boolean getSubscriptionStatus() {- return SubscriptionStatusLink.this.getSubscriptionStatus();- }-- @Override- protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {- SubscriptionStatusLink.this.onSubscriptionStatusChange(target, subscriptionStatus);- dropdown.close();- }-- };+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ String classes = tag.getAttribute("class");+ if (classes == null)+ classes = "";+ if (isSubscribed()) {+ tag.put("class", classes + " subscription-status subscribed");+ tag.put("title", "Subscribed. Click to unsubscribe");+ } else {+ tag.put("class", classes + " subscription-status unsubscribed");+ tag.put("title", "Unsubscribed. Click to subscribe");+ }}@Override@@ -58,8 +39,8 @@ public abstract class SubscriptionStatusLink extends DropdownLink {response.render(CssHeaderItem.forReference(new SubscriptionStatusResourceReference()));}- protected abstract boolean getSubscriptionStatus();+ protected abstract boolean isSubscribed();- protected abstract void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus);+ protected abstract void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscribed);}diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.htmldeleted file mode 100644index 90db14eeeb..0000000000--- a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="subscription-status">- <a wicket:id="doNotSubscribe">- <div class="title">Not subscribed</div>- <div class="description">Will not be notified of new entries</div>- </a>- <a wicket:id="subscribe">- <div class="title">Subscribed</div>- <div class="description">Will be notified of new entries</div>- </a>- </div>-</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.javadeleted file mode 100644index 4fcc6459ec..0000000000--- a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.java+++ /dev/null@@ -1,63 +0,0 @@-package io.onedev.server.web.component.subscriptionstatus;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.panel.Panel;--@SuppressWarnings("serial")-abstract class SubscriptionStatusPanel extends Panel {-- public SubscriptionStatusPanel(String id) {- super(id);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new AjaxLink<Void>("subscribe") {-- @Override- public void onClick(AjaxRequestTarget target) {- onSubscriptionStatusChange(target, true);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (getSubscriptionStatus())- add(AttributeAppender.append("class", "active"));- }-- });- add(new AjaxLink<Void>("doNotSubscribe") {-- @Override- public void onClick(AjaxRequestTarget target) {- onSubscriptionStatusChange(target, false);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (!getSubscriptionStatus())- add(AttributeAppender.append("class", "active"));- }-- });- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new SubscriptionStatusResourceReference()));- }-- protected abstract boolean getSubscriptionStatus();-- protected abstract void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus);--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.cssindex f74d196359..7154c7eb73 100644--- a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css@@ -9,35 +9,6 @@.subscription-status.subscribed:BEFORE {content: "\e038";}-.subscription-status.not-subscribed:BEFORE {+.subscription-status.unsubscribed:BEFORE {content: "\e036";}--.floating .subscription-status {- padding: 16px 0;-}-.floating .subscription-status a {- display: block;- color: #333;- padding: 8px 8px 8px 28px;- text-decoration: none;- position: relative;-}-.floating .subscription-status a.active:before {- font-family: "FontAwesome";- content: "\f00c";- position: absolute;- left: 8px;-}-.floating .subscription-status a .title {- font-weight: bold;-}-.floating .subscription-status a .description {- font-size: 13px;- color: #666;- margin-top: 4px;-}--.floating .subscription-status a:hover {- background: #F5F5F5;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex 052ca01765..f9df20daae 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -320,7 +320,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {}@Override- protected boolean getSubscriptionStatus() {+ protected boolean isSubscribed() {return getUserSubscriptionStatus(namedQuery);}@@ -406,7 +406,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {}@Override- protected boolean getSubscriptionStatus() {+ protected boolean isSubscribed() {return getProjectSubscriptionStatus(namedQuery);}