mirror of
https://github.com/grafana/grafana.git
synced 2024-12-27 09:21:35 -06:00
Fixed failing dashboard sql test
This commit is contained in:
parent
edb7722ad6
commit
e3764ad951
@ -89,7 +89,6 @@ func (ctx *Context) Handle(status int, title string, err error) {
|
||||
}
|
||||
|
||||
ctx.Data["Title"] = title
|
||||
|
||||
ctx.HTML(status, strconv.Itoa(status))
|
||||
}
|
||||
|
||||
|
@ -117,6 +117,10 @@ func SearchDashboards(query *m.SearchDashboardsQuery) error {
|
||||
params = append(params, query.Tag)
|
||||
}
|
||||
|
||||
if query.Limit == 0 || query.Limit > 10000 {
|
||||
query.Limit = 300
|
||||
}
|
||||
|
||||
sql.WriteString(fmt.Sprintf(" LIMIT %d", query.Limit))
|
||||
|
||||
var res []DashboardSearchProjection
|
||||
|
@ -53,7 +53,7 @@ func TestDashboardDataAccess(t *testing.T) {
|
||||
|
||||
Convey("Should be able to search for dashboard", func() {
|
||||
query := m.SearchDashboardsQuery{
|
||||
Title: "%test%",
|
||||
Title: "test",
|
||||
AccountId: 1,
|
||||
}
|
||||
|
||||
|
@ -19,6 +19,17 @@ function (angular) {
|
||||
});
|
||||
};
|
||||
|
||||
$scope.deleteUser = function(user) {
|
||||
$scope.appEvent('confirm-modal', {
|
||||
title: 'Delete user',
|
||||
text: 'Are you sure you want to delete user: ' + user.login,
|
||||
onConfirm: function() {
|
||||
backendSrv.delete('/api/admin/users/delete/' + user.id);
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
$scope.init();
|
||||
|
||||
});
|
||||
|
@ -31,7 +31,7 @@
|
||||
Edit
|
||||
</a>
|
||||
|
||||
<a ng-click="edit(variable)" class="btn btn-danger btn-small">
|
||||
<a ng-click="delete(variable)" class="btn btn-danger btn-small">
|
||||
<i class="fa fa-remove"></i>
|
||||
</a>
|
||||
</td>
|
||||
|
Loading…
Reference in New Issue
Block a user