Skip to content

Commit 5c1ae20

Browse files
CookiezaursCookiezaurs
authored
Merge pull request #5590 from Countly/anna/next
fixes for diff messages
2 parents e5716cf + 41247a0 commit 5c1ae20

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

‎frontend/express/public/core/app-management/templates/app-management.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
210210
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</span>
211211
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
212212
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
213-
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
213+
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
214214
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
215215
</span>
216216
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
@@ -391,8 +391,10 @@ <h3 class="bu-mb-2" v-if="!newApp && hasAppAdminRights">{{i18n('management-appli
391391
<div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
392392
<span class="selected-count-blue bu-pl-1 text-medium">
393393
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{changeKeys.length}}</span>
394-
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
395-
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
394+
<span v-if="changeKeys.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
395+
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
396+
<span v-if="changeKeys.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
397+
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
396398
</span>
397399
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
398400
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="saveSettings">

‎plugins/crashes/frontend/public/javascripts/countly.views.js‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,33 @@
605605
promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsShown", this.$data.selectedCrashgroups);
606606
}
607607
else if (state === "delete") {
608-
promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", this.$data.selectedCrashgroups);
608+
CountlyHelpers.confirm(jQuery.i18n.prop("crashes.confirm-delete", 1), "red", function(result) {
609+
if (result) {
610+
self.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", self.$data.selectedCrashgroups)
611+
.then(function(response) {
612+
if (Array.isArray(response.result)) {
613+
var itemList = response.result.reduce(function(acc, curr) {
614+
acc += "<li>" + curr + "</li>";
615+
return acc;
616+
}, "");
617+
CountlyHelpers.alert("<ul>" + itemList + "</ul>", "red", { title: CV.i18n("crashes.alert-fails") });
618+
}
619+
else {
620+
CountlyHelpers.notify({
621+
title: jQuery.i18n.map["systemlogs.action.crash_deleted"],
622+
message: jQuery.i18n.map["systemlogs.action.crash_deleted"]
623+
});
624+
}
625+
}).finally(function() {
626+
// Reset selection if command is delete or hide
627+
// if (["delete", "hide"].includes(state)) {
628+
self.selectedCrashgroups = [];
629+
self.$refs.dataTable.$refs.elTable.clearSelection();
630+
// }
631+
});
632+
}
633+
});
634+
609635
}
610636

611637
if (typeof promise !== "undefined") {

‎plugins/data-manager/frontend/public/javascripts/countly.views.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@
782782
var delKey = row.key || row.e || row.name;
783783
events.push(delKey);
784784
});
785+
this.unpatchSelectedEvents();
785786
this.$store.dispatch('countlyDataManager/deleteEvents', events).then(function() {
786787
countlyEvent.refreshEvents();
787788
});

‎plugins/plugins/frontend/public/templates/configurations.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
302302
<span class="selected-count-blue bu-pl-1 text-medium">
303303
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{diff.length}}</span>
304304
<span v-if="diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
305-
<span v-elseclass="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
305+
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
306306
<span v-if="diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
307307
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
308308
</span>

0 commit comments

Comments
 (0)