Skip to content

Commit dba6f3a

Browse files
committed
Missing css declaration for search fields.
export dropdown position Special names for properties(event groups in overview)
1 parent bde8305 commit dba6f3a

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

frontend/express/public/javascripts/countly/countly.event.js

+15
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@
192192
if (_activeEvents.map && _activeEvents.map[event_key] && _activeEvents.map[event_key][column]) {
193193
property = _activeEvents.map[event_key][column];
194194
}
195+
if (_activeEvents.overview[i].is_event_group) {
196+
if (_eventGroups && _eventGroups[event_key] && _eventGroups[event_key][column]) {
197+
property = _eventGroups[event_key][column];
198+
}
199+
}
195200
var description = "";
196201
if (_activeEvents.map && _activeEvents.map[event_key] && _activeEvents.map[event_key].description) {
197202
description = _activeEvents.map[event_key].description;
@@ -839,6 +844,16 @@
839844

840845
for (var i = 0; i < events.length; i++) {
841846
eventMap[events[i].key] = events[i];
847+
if (events[i].is_event_group === true) {
848+
if (_eventGroups && _eventGroups[events[i].key]) {
849+
var props = ["count", "sum", "dur"];
850+
for (var k = 0; k < props.length; k++) {
851+
if (_eventGroups[events[i].key][props[k]]) {
852+
events[i][props[k]] = _eventGroups[events[i].key][props[k]];
853+
}
854+
}
855+
}
856+
}
842857
}
843858

844859
return eventMap;

frontend/express/public/javascripts/countly/countly.template.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3114,9 +3114,9 @@ var AppRouter = Backbone.Router.extend({
31143114

31153115
if (exportAPIData || exportQueryData) {
31163116
//create export dialog
3117-
var position = 'right middle';
3117+
var position = 'left middle';
31183118
if (oSettings.oInstance && oSettings.oInstance.addColumnExportSelector === true) {
3119-
position = 'right top';
3119+
position = 'left top';
31203120
}
31213121

31223122
exportDrop = new CountlyDrop({
@@ -3146,7 +3146,7 @@ var AppRouter = Backbone.Router.extend({
31463146
exportDrop = new CountlyDrop({
31473147
target: tableWrapper.find('.save-table-data')[0],
31483148
content: "",
3149-
position: 'right middle',
3149+
position: 'left middle',
31503150
classes: "server-export",
31513151
constrainToScrollParent: false,
31523152
remove: true,

frontend/express/public/stylesheets/main.css

+1
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,7 @@ margin: 50px 0;}
14321432
.export-columns-selector .export-columns-search {
14331433
padding: 7px 15px;
14341434
border-top: 1px solid #D0D0D0;
1435+
background-color: #fbfbfb;
14351436
}
14361437

14371438
.export-columns-selector .export-columns-search table, .data-table-column-selector .export-columns-search table{

0 commit comments

Comments
 (0)