Merge pull request jenkinsci#2 from atai/master

Send user ID field bug fix.

Author: atai

src/main/java/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator.java

@@ -14,7 +14,7 @@ public class MatomoPageDecorator extends PageDecorator {
     private String matomoServer;
     private String matomoPath;
     private boolean matomoUseHttps = true;
-    private boolean sendUserID = false;
+    private boolean matomoSendUserID = false;
 
     public MatomoPageDecorator() {
         super();
@@ -26,13 +26,13 @@ public MatomoPageDecorator(String matomoSiteID,
                                String matomoServer,
                                String matomoPath,
                                boolean matomoUseHttps,
-                               boolean sendUserID) {
+                               boolean matomoSendUserID) {
         this();
         setMatomoSiteID(matomoSiteID);
         setMatomoServer(matomoServer);
         setMatomoPath(matomoPath);
         setMatomoUseHttps(matomoUseHttps);
-        setSendUserID(sendUserID);
+        setMatomoSendUserID(matomoSendUserID);
     }
 
     @Override
@@ -75,12 +75,12 @@ public void setMatomoUseHttps(boolean matomoUseHttps) {
         this.matomoUseHttps = matomoUseHttps;
     }
 
-    public boolean isSendUserID() {
-        return sendUserID;
+    public boolean isMatomoSendUserID() {
+        return matomoSendUserID;
     }
 
-    public void setSendUserID(boolean sendUserID) {
-        this.sendUserID = sendUserID;
+    public void setMatomoSendUserID(boolean matomoSendUserID) {
+        this.matomoSendUserID = matomoSendUserID;
     }
 
     public String getProtocolString() {

src/main/resources/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator/footer.jelly

@@ -9,7 +9,7 @@
                 _paq.push(['trackPageView']);
                 _paq.push(['enableLinkTracking']);
                 var d = document;
-                if (${it.sendUserID}) {
+                if ("${it.matomoSendUserID}") {
                     var userID, userIDNode, Nodes = d.getElementsByClassName('hidden-xs hidden-sm');
                     if (Nodes !== undefined) {
                         _paq.push(['setUserId', Nodes[0].textContent]);

src/main/resources/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator/global.jelly

@@ -10,7 +10,7 @@
         <f:entry title="${%Matomo Path}"  help="/plugin/matomo-analytics/matomopath.html">
             <f:textbox field="matomoPath"/>
         </f:entry>
-        <f:entry title="${%Send user ID}" field="matomoSendUserID" help="/plugin/matomo-analytics/matomousenduserid.html">
+        <f:entry title="${%Send user ID}" field="matomoSendUserID" help="/plugin/matomo-analytics/matomosenduserid.html">
             <f:checkbox/>
         </f:entry>
         <f:entry title="${%Use https}" field="matomoUseHttps" help="/plugin/matomo-analytics/matomousehttps.html">