Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
e3764ad9
Commit
e3764ad9
authored
Feb 05, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing dashboard sql test
parent
edb7722a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
3 deletions
+17
-3
pkg/middleware/middleware.go
+0
-1
pkg/services/sqlstore/dashboard.go
+4
-0
pkg/services/sqlstore/dashboard_test.go
+1
-1
src/app/features/admin/adminUsersCtrl.js
+11
-0
src/app/features/admin/partials/users.html
+1
-1
No files found.
pkg/middleware/middleware.go
View file @
e3764ad9
...
...
@@ -89,7 +89,6 @@ func (ctx *Context) Handle(status int, title string, err error) {
}
ctx
.
Data
[
"Title"
]
=
title
ctx
.
HTML
(
status
,
strconv
.
Itoa
(
status
))
}
...
...
pkg/services/sqlstore/dashboard.go
View file @
e3764ad9
...
...
@@ -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
...
...
pkg/services/sqlstore/dashboard_test.go
View file @
e3764ad9
...
...
@@ -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
,
}
...
...
src/app/features/admin/adminUsersCtrl.js
View file @
e3764ad9
...
...
@@ -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
();
});
...
...
src/app/features/admin/partials/users.html
View file @
e3764ad9
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment