Skip to content

Commit

Permalink
[push] Don’t show create message button for non-admins
Browse files Browse the repository at this point in the history
  • Loading branch information
Artem authored and Artem committed Jan 18, 2017
1 parent 16eff12 commit 689a635
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 51 deletions.
4 changes: 3 additions & 1 deletion plugins/push/frontend/public/javascripts/component.push.dash.js
View file
Expand Up @@ -191,7 +191,9 @@ window.component('push.dash', function(dash) {
m.component(components.widget, {
header: {
title: 'pu.dash.users',
view: m('a.icon-button.btn-header.green[href=#]', {onclick: ctrl.message}, t('pu.dash.create'))
view: countlyGlobal.member.admin_of && countlyGlobal.member.admin_of.indexOf(countlyCommon.ACTIVE_APP_ID) !== -1 ?
m('a.icon-button.btn-header.green[href=#]', {onclick: ctrl.message}, t('pu.dash.create'))
: ''
},
footer: {
config: {class: 'condensed'},
Expand Down
108 changes: 58 additions & 50 deletions plugins/push/frontend/public/javascripts/countly.views.js
View file
Expand Up @@ -66,34 +66,38 @@ app.addAppObjectModificator(function(args){

app.addPageScript("/drill#", function(){
if(countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].type == "mobile"){
$("#drill-actions").append('<a class="link icon-button light btn-create-message"><i class="ion-chatbox-working"></i><span data-localize="push.create"></span></a>');
app.localize();
$('.btn-create-message').off('click').on('click', function(){
var message = {
apps: [countlyCommon.ACTIVE_APP_ID],
drillConditions: countlySegmentation.getRequestData()
};

// for (var k in filterData.dbFilter) {
// if (k.indexOf('up.') === 0) message.conditions[k.substr(3).replace("cmp_","cmp.")] = filterData.dbFilter[k];
// }

components.push.popup.show(message);
});
$("#bookmark-view").on("click", ".bookmark-action.send", function() {
var filter = $(this).data("query");

var message = {
apps: [countlyCommon.ACTIVE_APP_ID],
drillConditions: filter
};

// for (var k in filter) {
// if (k.indexOf('up.') === 0) message.conditions[k.substr(3).replace("cmp_","cmp.")] = filter[k];
// }

components.push.popup.show(message);
});
if (countlyGlobal.member.global_admin || (countlyGlobal.member.admin_of && countlyGlobal.member.admin_of.indexOf(countlyCommon.ACTIVE_APP_ID) !== -1)) {
$("#drill-actions").append('<a class="link icon-button light btn-create-message"><i class="ion-chatbox-working"></i><span data-localize="push.create"></span></a>');
app.localize();
$('.btn-create-message').off('click').on('click', function(){
var message = {
apps: [countlyCommon.ACTIVE_APP_ID],
drillConditions: countlySegmentation.getRequestData()
};

// for (var k in filterData.dbFilter) {
// if (k.indexOf('up.') === 0) message.conditions[k.substr(3).replace("cmp_","cmp.")] = filterData.dbFilter[k];
// }

components.push.popup.show(message);
});
$("#bookmark-view").on("click", ".bookmark-action.send", function() {
var filter = $(this).data("query");

var message = {
apps: [countlyCommon.ACTIVE_APP_ID],
drillConditions: filter
};

// for (var k in filter) {
// if (k.indexOf('up.') === 0) message.conditions[k.substr(3).replace("cmp_","cmp.")] = filter[k];
// }

components.push.popup.show(message);
});
} else {
$('#drill-actions').remove('.btn-create-message');
}
}
});

Expand All @@ -112,7 +116,7 @@ function modifyUserDetailsForPush () {
test = !!userDetails.tk.id || !!userDetails.tk.ia || !!userDetails.tk.at;
prod = !!userDetails.tk.ip || !!userDetails.tk.ap;
}
if (tokens.length) {
if (tokens.length && (countlyGlobal.member.global_admin || (countlyGlobal.member.admin_of && countlyGlobal.member.admin_of.indexOf(countlyCommon.ACTIVE_APP_ID) !== -1))) {
if (!$('.btn-create-message').length) {
$('#user-profile-detail-buttons').append($('<a class="icon-button green left btn-create-message" data-localize="push.create"></a>').text(jQuery.i18n.map['push.create']));
}
Expand All @@ -138,28 +142,32 @@ function modifyUserDetailsForPush () {
}
} else {
//list view
if (!$('.btn-create-message').length) {
$('.widget-header .left').append($('<a class="icon-button green btn-header left btn-create-message" data-localize="push.create"></a>').text(jQuery.i18n.map['push.create']));
}
$('.btn-create-message').off('click').on('click', function(){
//drill filter
var filterData = app.userdataView._query || {};

//known/anonymous filter
if(app.userdataView.filter == "user-known")
filterData.hasInfo = true;
else if(app.userdataView.filter == "user-anonymous")
filterData.hasInfo = {"$ne": true};

//text search filter
if($('.dataTables_filter input').val().length)
filterData.$text = { "$search": "\""+$('.dataTables_filter input').val()+"\"" };

components.push.popup.show({
apps: [countlyCommon.ACTIVE_APP_ID],
userConditions: filterData
if (countlyGlobal.member.global_admin || (countlyGlobal.member.admin_of && countlyGlobal.member.admin_of.indexOf(countlyCommon.ACTIVE_APP_ID) !== -1)) {
if (!$('.btn-create-message').length) {
$('.widget-header .left').append($('<a class="icon-button green btn-header left btn-create-message" data-localize="push.create"></a>').text(jQuery.i18n.map['push.create']));
}
$('.btn-create-message').off('click').on('click', function(){
//drill filter
var filterData = app.userdataView._query || {};

//known/anonymous filter
if(app.userdataView.filter == "user-known")
filterData.hasInfo = true;
else if(app.userdataView.filter == "user-anonymous")
filterData.hasInfo = {"$ne": true};

//text search filter
if($('.dataTables_filter input').val().length)
filterData.$text = { "$search": "\""+$('.dataTables_filter input').val()+"\"" };

components.push.popup.show({
apps: [countlyCommon.ACTIVE_APP_ID],
userConditions: filterData
});
});
});
} else {
$('.btn-create-message').remove();
}
}
}
}
Expand Down

0 comments on commit 689a635

Please sign in to comment.