IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: dont show settings for viewers

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-15 14:51:20 +01:00
parent a8a5f8181b
commit d1e0e36996
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashboard_model.ts
View File

@ -117,6 +117,8 @@ export class DashboardModel {
meta.canSave = meta.canSave !== false;
meta.canStar = meta.canStar !== false;
meta.canEdit = meta.canEdit !== false;
meta.showSettings = meta.canEdit;
meta.canMakeEditable = meta.canSave && !this.editable;
if (!this.editable) {
meta.canEdit = false;

2
public/app/features/dashboard/dashnav/dashnav.html
View File

@ -37,7 +37,7 @@
<i class="fa fa-link"></i>
</button>
<button class="btn navbar-button navbar-button--settings" ng-click="ctrl.toggleSettings()" bs-tooltip="'Settings'" data-placement="bottom">
<button class="btn navbar-button navbar-button--settings" ng-click="ctrl.toggleSettings()" bs-tooltip="'Settings'" data-placement="bottom" ng-show="ctrl.dashboard.meta.showSettings">
<i class="fa fa-cog"></i>
</button>
</div>

9
public/app/features/dashboard/settings/settings.ts
View File

@ -35,6 +35,7 @@ export class SettingsCtrl {
buildSectionList() {
this.sections = [];
if (this.dashboard.meta.canEdit) {
this.sections.push({ title: 'General', id: 'settings', icon: 'gicon gicon-preferences' });
this.sections.push({ title: 'Annotations', id: 'annotations', icon: 'gicon gicon-annotation' });
@ -46,9 +47,8 @@ export class SettingsCtrl {
this.sections.push({ title: 'Versions', id: 'versions', icon: 'fa fa-fw fa-history' });
}
if (contextSrv.isEditor && !this.dashboard.editable) {
if (this.dashboard.meta.canMakeEditable) {
this.sections.push({ title: 'Make Editable', icon: 'fa fa-fw fa-edit', id: 'make_editable' });
this.viewId = 'make_editable';
}
this.sections.push({ title: 'View JSON', id: 'view_json', icon: 'gicon gicon-json' });
@ -69,11 +69,14 @@ export class SettingsCtrl {
this.json = JSON.stringify(this.dashboard.getSaveModelClone(), null, 2);
}
if (this.viewId === 'settings' && this.dashboard.meta.canMakeEditable) {
this.viewId = 'make_editable';
}
const currentSection = _.find(this.sections, { id: this.viewId });
if (!currentSection) {
this.sections.unshift({ title: 'Not found', id: '404', icon: 'fa fa-fw fa-warning' });
this.viewId = '404';
return;
}
}