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 branch 'v3.0.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-25 11:04:12 +02:00
commit 2cd6c2e7e0
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -209,7 +209,7 @@ func Register(r *macaron.Macaron) {
r.Combo("/db/:slug").Get(GetDashboard).Delete(DeleteDashboard) r.Combo("/db/:slug").Get(GetDashboard).Delete(DeleteDashboard)
r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), PostDashboard) r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), PostDashboard)
r.Get("/file/:file", GetDashboardFromJsonFile) r.Get("/file/:file", GetDashboardFromJsonFile)
r.Get("/home", GetHomeDashboard) r.Get("/home", wrap(GetHomeDashboard))
r.Get("/tags", GetDashboardTags) r.Get("/tags", GetDashboardTags)
r.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard)) r.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard))
}) })

14
pkg/api/dashboard.go
View File

@ -159,10 +159,10 @@ func canEditDashboard(role m.RoleType) bool {
return role == m.ROLE_ADMIN || role == m.ROLE_EDITOR || role == m.ROLE_READ_ONLY_EDITOR return role == m.ROLE_ADMIN || role == m.ROLE_EDITOR || role == m.ROLE_READ_ONLY_EDITOR
} }
func GetHomeDashboard(c *middleware.Context) { func GetHomeDashboard(c *middleware.Context) Response {
prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId} prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId}
if err := bus.Dispatch(&prefsQuery); err != nil { if err := bus.Dispatch(&prefsQuery); err != nil {
c.JsonApiErr(500, "Failed to get preferences", err) return ApiError(500, "Failed to get preferences", err)
} }
if prefsQuery.Result.HomeDashboardId != 0 { if prefsQuery.Result.HomeDashboardId != 0 {
@ -170,7 +170,7 @@ func GetHomeDashboard(c *middleware.Context) {
err := bus.Dispatch(&slugQuery) err := bus.Dispatch(&slugQuery)
if err == nil { if err == nil {
dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result} dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
c.JSON(200, &dashRedirect) return Json(200, &dashRedirect)
} else { } else {
log.Warn("Failed to get slug from database, %s", err.Error()) log.Warn("Failed to get slug from database, %s", err.Error())
} }
@ -179,8 +179,7 @@ func GetHomeDashboard(c *middleware.Context) {
filePath := path.Join(setting.StaticRootPath, "dashboards/home.json") filePath := path.Join(setting.StaticRootPath, "dashboards/home.json")
file, err := os.Open(filePath) file, err := os.Open(filePath)
if err != nil { if err != nil {
c.JsonApiErr(500, "Failed to load home dashboard", err) return ApiError(500, "Failed to load home dashboard", err)
return
} }
dash := dtos.DashboardFullWithMeta{} dash := dtos.DashboardFullWithMeta{}
@ -188,11 +187,10 @@ func GetHomeDashboard(c *middleware.Context) {
dash.Meta.CanEdit = canEditDashboard(c.OrgRole) dash.Meta.CanEdit = canEditDashboard(c.OrgRole)
jsonParser := json.NewDecoder(file) jsonParser := json.NewDecoder(file)
if err := jsonParser.Decode(&dash.Dashboard); err != nil { if err := jsonParser.Decode(&dash.Dashboard); err != nil {
c.JsonApiErr(500, "Failed to load home dashboard", err) return ApiError(500, "Failed to load home dashboard", err)
return
} }
c.JSON(200, &dash) return Json(200, &dash)
} }
func GetDashboardFromJsonFile(c *middleware.Context) { func GetDashboardFromJsonFile(c *middleware.Context) {

3
public/app/features/dashboard/rowCtrl.js
View File

@ -142,9 +142,10 @@ function (angular, _, config) {
}); });
module.directive('panelWidth', function() { module.directive('panelWidth', function() {
var fullscreen = false;
return function(scope, element) { return function(scope, element) {
var fullscreen = false;
function updateWidth() { function updateWidth() {
if (!fullscreen) { if (!fullscreen) {
element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%'; element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%';

2
public/app/features/templating/templateSrv.js
View File

@ -103,7 +103,7 @@ function (angular, _) {
} }
variableName = regexEscape(variableName); variableName = regexEscape(variableName);
var findVarRegex = new RegExp('\\$(' + variableName + ')[\\W|$]|\\[\\[(' + variableName + ')\\]\\]', 'g'); var findVarRegex = new RegExp('\\$(' + variableName + ')(?:\\W|$)|\\[\\[(' + variableName + ')\\]\\]', 'g');
var match = findVarRegex.exec(str); var match = findVarRegex.exec(str);
return match !== null; return match !== null;
}; };

4
public/test/specs/templateSrv-specs.js
View File

@ -205,6 +205,10 @@ define([
expect(contains).to.be(true); expect(contains).to.be(true);
}); });
it('should find it its the only thing', function() {
var contains = _templateSrv.containsVariable('$env', 'env');
expect(contains).to.be(true);
});
}); });
describe('updateTemplateData with simple value', function() { describe('updateTemplateData with simple value', function() {