Skip to content

changes to diff message(different for single/multi) #5589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 20, 2024
Merged

changes to diff message(different for single/multi) #5589

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
368f959
show "use_union_with" setting in app settings
Cookiezaurs Sep 19, 2024
42ab323
changes to diff message(different for single/multi)
Cookiezaurs Sep 20, 2024
86c76d1
fix
Cookiezaurs Sep 20, 2024
d9871b1
Merge branch 'next' into anna/next
Cookiezaurs Sep 20, 2024
442443a
eslint
Cookiezaurs Sep 20, 2024
edb98f3
Merge branch 'anna/next' of https://github.com/Countly/countly-server…
Cookiezaurs Sep 20, 2024
0413786
Putting back overwritten error handling
Cookiezaurs Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions frontend/express/public/core/app-management/templates/app-management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,10 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
<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%;">
<span class="selected-count-blue bu-pl-1 text-medium">
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</span>
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<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>
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save(formScope.editedObject)">
Expand Down
2 changes: 2 additions & 0 deletions frontend/express/public/localization/dashboard/dashboard.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,10 @@ common.undo = Undo
common.drawer.next-step = Next step
common.drawer.previous-step = Previous step
common.diff-helper.changes = You made {0} changes.
common.diff-helper.changes-made-single = change has been made.
common.diff-helper.changes-made = changes have been made.
common.diff-helper.keep = Do you want to keep them?
common.diff-helper.keep-single = Do you want to keep it?
common.save-changes = Save Changes
common.discard-changes = Discard
common.complete = Complete
Expand Down
3 changes: 3 additions & 0 deletions plugins/data-manager/frontend/public/javascripts/countly.models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,9 @@
if (res === 'EVENT_STATUS_UNPLANNED') {
CountlyHelpers.notify({message: CV.i18n('data-manager.error.event-visibility-error'), sticky: false, type: 'error'});
}
else{
CountlyHelpers.notify({message: CV.i18n('data-manager.success.visibility'), sticky: false, type: 'success'});
}
context.dispatch('loadEventsData');
context.dispatch('loadSegmentsMap');
}).catch(function(e) {
Expand Down
1 change: 1 addition & 0 deletions plugins/data-manager/frontend/public/localization/data-manager.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ data-manager.success.event-update = Event Updated
data-manager.error.event-update = Error while updating event
data-manager.success.event-delete = Event Deleted
data-manager.error.event-delete = Error while deleting event
data-manager.success.visibility = Visibility updated
data-manager.success.category-create = Category Created
data-manager.error.category-create = Error while creating category
data-manager.success.category-update = Category Updated
Expand Down
1 change: 1 addition & 0 deletions plugins/plugins/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,7 @@
"big_list_limit": true,
"record_big_list": true,
"cache_threshold": true,
"use_union_with": true,
"correct_estimation": true,
"custom_property_limit": true,
"list_limit": true,
Expand Down
6 changes: 4 additions & 2 deletions plugins/plugins/frontend/public/templates/configurations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,10 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
<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%;">
<span class="selected-count-blue bu-pl-1 text-medium">
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{diff.length}}</span>
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<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>
<span v-elseclass="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save">
Expand Down
6 changes: 4 additions & 2 deletions plugins/plugins/frontend/public/templates/plugins.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
<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%;">
<span class="selected-count-blue bu-pl-1 text-medium">
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{scope.diff.length}}</span>
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-if="scope.diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="scope.diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="updateStatus(scope)">
Expand Down