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

Merge pull request #4187 from raintank/issue4185

Browse Source 
replace 'app' with 'plugins' where needed.
This commit is contained in:
Anthony Woods 2016-02-29 15:59:30 +08:00
commit fc8146b53d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/plugins/page_ctrl.ts
View File

@ -5,14 +5,13 @@ import _ from 'lodash';
export class AppPageCtrl { export class AppPageCtrl {
page: any; page: any;
appId: any; pluginId: any;
appModel: any; appModel: any;
/** @ngInject */ /** @ngInject */
constructor(private backendSrv, private $routeParams: any, private $rootScope) { constructor(private backendSrv, private $routeParams: any, private $rootScope) {
this.appId = $routeParams.appId; this.pluginId = $routeParams.pluginId;
this.backendSrv.get(`/api/org/plugins/${this.pluginId}/settings`).then(app => {
this.backendSrv.get(`/api/org/apps/${this.appId}/settings`).then(app => {
this.appModel = app; this.appModel = app;
this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug}); this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug});
if (!this.page) { if (!this.page) {

2
public/app/features/plugins/partials/edit.html
View File

@ -72,7 +72,7 @@
{{ds.name}} {{ds.name}}
</li> </li>
<li ng-repeat="page in ctrl.model.pages"> <li ng-repeat="page in ctrl.model.pages">
<a href="apps/{{ctrl.appId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a> <a href="plugins/{{ctrl.pluginId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a>
</li> </li>
</ul> </ul>
</section> </section>

2
public/app/features/plugins/partials/page.html
View File

@ -1,4 +1,4 @@
<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.appId}}/edit"> <navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.pluginId}}/edit">
</navbar> </navbar>
<div class="page-container"> <div class="page-container">