From a00908444f4b39ad2647a8be4f76700d4474ac01 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Mon, 30 May 2016 22:49:52 +0200
Subject: [PATCH] refs #9984 - adds confirmation when changing segments
definition
---
plugins/SegmentEditor/javascripts/Segmentation.js | 11 ++++++++++-
plugins/SegmentEditor/lang/en.json | 1 +
plugins/SegmentEditor/templates/_segmentSelector.twig | 5 +++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index ce3c166cf1..2623570f21 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -1075,7 +1075,16 @@ Segmentation = (function($) {
jQuery.extend(params, {
"idSegment": segmentId
});
- self.updateMethod(params);
+
+ if(segmentStr != getSegmentFromId(segmentId).definition) {
+ piwikHelper.modalConfirm(self.target.find('.segment-change-confirm'), {
+ yes: function () {
+ self.updateMethod(params);
+ }
+ });
+ } else {
+ self.updateMethod(params);
+ }
}
};
diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json
index 96e36c02b7..805f240253 100644
--- a/plugins/SegmentEditor/lang/en.json
+++ b/plugins/SegmentEditor/lang/en.json
@@ -6,6 +6,7 @@
"AreYouSureDeleteSegment": "Are you sure you want to delete this segment?",
"AutoArchivePreProcessed": "segmented reports are pre-processed (faster, requires cron)",
"AutoArchiveRealTime": "segmented reports are processed in real time",
+ "ChangingSegmentConfirmation": "You're about to change the segment definition. Your analytics reports for this new segment won't be available until the reports are re-processed. It may take a few hours to reprocess your reports. Proceed anyway?",
"ChooseASegment": "Choose a segment",
"CurrentlySelectedSegment": "Currently selected segment: %s",
"DataAvailableAtLaterDate": "Your segmented analytics reports will be available later. We apologize for the inconvenience.",
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index 22241c389f..c94930057b 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -167,6 +167,11 @@
<input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
<input role="no" type="button" value="{{ 'General_No'|translate }}"/>
</div>
+<div class="ui-confirm segment-change-confirm">
+ <h2>{{ 'SegmentEditor_ChangingSegmentConfirmation'|translate }}</h2>
+ <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
+ <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
+</div>
<div class="ui-confirm pleaseChangeBrowserAchivingDisabledSetting">
<h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|raw }}</h2>
{% set segmentSetting %}{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }}{% endset %}
--
GitLab