Skip to content
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.

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

new dashboard is now hidden from viewer, fixes #10815 #10854

Merged
merged 4 commits into from Feb 12, 2018

Conversation

Ijin08
Copy link
Contributor

@Ijin08 Ijin08 commented Feb 9, 2018

fixes #10815

skarmavbild 2018-02-09 kl 11 09 32

@Ijin08 Ijin08 requested a review from torkelo February 9, 2018 10:10
@@ -24,6 +26,7 @@ export class SearchCtrl {
this.initialFolderFilterTitle = 'All';
this.getTags = this.getTags.bind(this);
this.onTagSelect = this.onTagSelect.bind(this);
this.orgRole = config.bootData.user.orgRole;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use contexSrv.isEditor instead

@codecov-io
Copy link

codecov-io commented Feb 9, 2018

Codecov Report

Merging #10854 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master   #10854      +/-   ##
==========================================
- Coverage   51.22%    51.2%   -0.02%     
==========================================
  Files         340      340              
  Lines       24030    24017      -13     
  Branches     1417     1417              
==========================================
- Hits        12309    12299      -10     
+ Misses      11036    11033       -3     
  Partials      685      685

@torkelo torkelo merged commit aaf4e76 into master Feb 12, 2018
@torkelo torkelo added this to the 5.0.0-beta2 milestone Feb 12, 2018
ryantxu added a commit to NatelEnergy/grafana that referenced this pull request Feb 13, 2018
* grafana/master:
  new dashboard is now hidden from viewer, fixes grafana#10815 (grafana#10854)
  fixed bg gradient, fixes grafana#10869 (grafana#10875)
  login: fix broken reset password form (grafana#10881)
  docs: spelling.
  dashboard: always make sure dashboard exist in dashboard acl http api (grafana#10856)
  Fix grafana#10823 (grafana#10851)
  provisioning: better variable naming
  provisioning: dont return error unless you want to cancel all operations
  provisioning: createWalkFn doesnt have to be attached to the filereader anymore
  provisioning: update sample config to use path
  provisioning: avoid caching and use updated field from db
  provisioning: delete dashboards before insert/update
  provisioning: fixed bug in saving dashboards.
  provisioning: delete dashboards from db when file is missing
  provisioning: enables title changes for dashboards
  dashboards: save provisioning meta data
  provisioing: add lookup table provisioned dashboards
  codestyle: extract code into methods
@bergquist bergquist deleted the 10815_hide_for_viewer branch February 16, 2018 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Viewer role user can view "New dashboard" link in grafana 5.0.
3 participants