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

When role is viewer and edit URL is loaded view mode will be loaded instead, Closes #2089

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-01 16:49:14 +02:00
parent 83e7c48767
commit 86f5152092
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard/viewStateSrv.js
View File

@ -130,10 +130,11 @@ function (angular, _, $) {
var docHeight = $(window).height();
var editHeight = Math.floor(docHeight * 0.3);
var fullscreenHeight = Math.floor(docHeight * 0.7);
this.oldTimeRange = panelScope.range;
panelScope.height = this.state.edit ? editHeight : fullscreenHeight;
panelScope.editMode = this.state.edit;
panelScope.editMode = this.state.edit && this.$scope.dashboardMeta.canEdit;
panelScope.height = panelScope.editMode ? editHeight : fullscreenHeight;
this.oldTimeRange = panelScope.range;
this.fullscreenPanel = panelScope;
$(window).scrollTop(0);

6
public/app/features/panel/panelMenu.js
View File

@ -8,7 +8,7 @@ function (angular, $, _) {
angular
.module('grafana.directives')
.directive('panelMenu', function($compile, linkSrv, contextSrv) {
.directive('panelMenu', function($compile, linkSrv) {
var linkTemplate =
'<span class="panel-title drag-handle pointer">' +
'<span class="panel-title-text drag-handle">{{panel.title | interpolateTemplateVars:this}}</span>' +
@ -19,7 +19,7 @@ function (angular, $, _) {
function createMenuTemplate($scope) {
var template = '<div class="panel-menu small">';
if ($scope.dashboardMeta.canEdit && contextSrv.isEditor) {
if ($scope.dashboardMeta.canEdit) {
template += '<div class="panel-menu-inner">';
template += '<div class="panel-menu-row">';
template += '<a class="panel-menu-icon pull-left" ng-click="updateColumnSpan(-1)"><i class="fa fa-minus"></i></a>';
@ -34,7 +34,7 @@ function (angular, $, _) {
_.each($scope.panelMeta.menu, function(item) {
// skip edit actions if not editor
if (item.role === 'Editor' && (!contextSrv.isEditor || !$scope.dashboardMeta.canEdit)) {
if (item.role === 'Editor' && !$scope.dashboardMeta.canEdit) {
return;
}

8
public/app/features/panel/panelSrv.js
View File

@ -71,14 +71,6 @@ function (angular, _, config) {
};
$scope.toggleFullscreen = function(edit) {
if (edit && $scope.dashboardMeta.canEdit === false) {
$scope.appEvent('alert-warning', [
'Dashboard not editable',
'Use Save As.. feature to create an editable copy of this dashboard.'
]);
return;
}
$scope.dashboardViewState.update({ fullscreen: true, edit: edit, panelId: $scope.panel.id });
};