in segmented visitor log segment is already encoded, decode it again …

…when adding as new (matomo-org#14221) * segment is already double encoded, decode it again * Remove addSegmentAsNew after apply and save.
fdellwing · Mar 19, 2019 · f5d425c · f5d425c
1 parent 94fa2b3
commit f5d425c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/Live/javascripts/visitorLog.js b/plugins/Live/javascripts/visitorLog.js
@@ -53,7 +53,7 @@
                 e.stopPropagation();
 
                 var url = window.location.href;
-                url = broadcast.updateParamValue('addSegmentAsNew=' + self.param.segment, url);
+                url = broadcast.updateParamValue('addSegmentAsNew=' + decodeURIComponent(self.param.segment), url);
                 url = broadcast.updateParamValue('segment=', url);
                 url = broadcast.updateParamValue('popover=', url);
 

diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -854,12 +854,12 @@ $(document).ready(function() {
 
         this.forceSegmentReload = function (segmentDefinition) {
             segmentDefinition = this.uriEncodeSegmentDefinition(segmentDefinition);
-            
+
             if (piwikHelper.isAngularRenderingThePage()) {
-                return broadcast.propagateNewPage('', true, 'segment=' + segmentDefinition);
+                return broadcast.propagateNewPage('', true, 'addSegmentAsNew=&segment=' + segmentDefinition);
             } else {
                 // eg in case of exported dashboard
-                return broadcast.propagateNewPage('segment=' + segmentDefinition, true, 'segment=' + segmentDefinition);
+                return broadcast.propagateNewPage('segment=' + segmentDefinition, true, 'addSegmentAsNew=&segment=' + segmentDefinition);
             }
         };