Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-resource-management
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-resource-management
Commits
e2ff8ee4
Commit
e2ff8ee4
authored
Jun 07, 2019
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed JSON return messages
parent
94d9cd33
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
employee-assignment-pie-chart.json.tcl
www/employee-assignment-pie-chart.json.tcl
+3
-3
No files found.
www/employee-assignment-pie-chart.json.tcl
View file @
e2ff8ee4
...
...
@@ -20,7 +20,7 @@ ad_page_contract {
set
current_user_id
[
ad_conn user_id
]
if
{
!
[
im_permission
$current
_user_id view_users
]}
{
set json
"{
\"
success
\"
: false,
\"
message
\"
:
\"
Insufficient permissions - you need view_users.
\"
}"
doc_return
200
"text/html
"
$json
doc_return
400
"application/json
"
$json
ad_script_abort
}
...
...
@@ -35,7 +35,7 @@ switch $diagram_interval {
over_last_quarter
{
db_1row date
"select now()::date - 180 as start_date, now()::date -90 as end_date"
}
default
{
set json
"{
\"
success
\"
: false,
\"
message
\"
:
\"
Invalid diagram_interval option: '
$diagram
_interval'.
\"
}"
doc_return
200
"text/html
"
$json
doc_return
400
"application/json
"
$json
ad_script_abort
}
}
...
...
@@ -115,5 +115,5 @@ multirow foreach mr {
lappend data_list
"{
\"
name
\"
:
\"
$name
\"
,
\"
value
\"
:
$value
}"
}
set
json
"{
\"
success
\"
: true,
\"
message
\"
:
\"
Data loaded
\"
,
\"
data
\"
:
\[\n
[
join
$data
_list
",
\n
"
]
\n\]
}"
doc_return 200
"
text/html
"
$json
doc_return 200
"
application/json
"
$json
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