Skip to content

I
intranet-rest
Commit 291c81aa authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Fixed JSON return messages

parent 9bf99afe
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
tcl/intranet-rest-data-source-procs.tcl
View file @ 291c81aa
......@@ -60,11 +60,11 @@ ad_proc im_rest_project_task_tree_action {
delete { im_rest_project_task_tree_delete -pass $pass -project_id $project_id -var_hash_list [array get var_hash] }
default {
ns_log Error "im_rest_project_task_tree_action: tree_action: found invalid action=$action"
doc_return 400 "text/plain" "{success:false, message: 'tree_action: found invalid action=[im_quotejson $action]'}"
doc_return 400 "text/plain" "{\"success\": false, \"message\": \"tree_action: found invalid action=[im_quotejson $action]\"}"
return
}
}
# The calling procedure will return a suitable JSON success message
# The calling procedure will return a suitable JSON message
}
ad_proc im_rest_project_task_tree_update {
......@@ -81,7 +81,7 @@ ad_proc im_rest_project_task_tree_update {
if {"" == $project_id} {
ns_log Error "im_rest_project_task_tree_update: Did not find project_id in JSON data: $var_hash_list"
doc_return 400 "text/plain" "{success:false, message: 'Did not find project_id in JSON data: [im_quotejson $var_hash_list]'}"
doc_return 400 "text/plain" "{\"success\": false, \"message\": \"Did not find project_id in JSON data: [im_quotejson $var_hash_list]\"}"
return
}
......@@ -98,7 +98,7 @@ ad_proc im_rest_project_task_tree_update {
if {!$write} {
ns_log Error "im_rest_project_task_tree_update: No write permission for user #$current_user_id ([im_name_from_user_id $current_user_id]) \
on task or project #$project_id ([acs_object_name $project_id])"
doc_return 401 "text/plain" "{success:false, message: 'User #$current_user_id ([im_name_from_user_id $current_user_id]) has not enough permissions to modify $object_type #$project_id ([acs_object_name $project_id])'}"
doc_return 401 "text/plain" "{\"success\": false, \"message\": \"User #$current_user_id ([im_name_from_user_id $current_user_id]) has not enough permissions to modify $object_type #$project_id ([acs_object_name $project_id])\"}"
return
}
......@@ -138,7 +138,7 @@ ad_proc im_rest_project_task_tree_delete {
if {"" == $project_id} {
ns_log Error "im_rest_project_task_tree_delete: Delete failed because we did not find project_id in JSON data: $var_hash_list"
doc_return 400 "text/plain" "{success:false, message: \"Delete failed because we did not find project_id in JSON data: [im_quotejson $var_hash_list]\"}"
doc_return 400 "text/plain" "{\"success\": false, \"message\": \"Delete failed because we did not find project_id in JSON data: [im_quotejson $var_hash_list]\"}"
return
}
......@@ -148,7 +148,7 @@ ad_proc im_rest_project_task_tree_delete {
${object_type}_permissions $current_user_id $project_id view read write admin
if {!$admin} {
ns_log Error "im_rest_project_task_tree_delete: No permissions to admin project_id=$project_id for user=$current_user_id"
doc_return 401 "text/plain" "{success:false, message: \"No permissions to admin project_id=$project_id for user=$current_user_id\"}"
doc_return 401 "text/plain" "{\"success\": false, \"message\": \"No permissions to admin project_id=$project_id for user=$current_user_id\"}"
return
}
......@@ -162,7 +162,7 @@ ad_proc im_rest_project_task_tree_delete {
if {"" ne $err_msg} {
ns_log Error "im_rest_project_task_tree_delete: $err_msg"
doc_return 500 "text/plain" "{success:false, message: \"[im_quotejson $err_msg]\"}"
doc_return 500 "text/plain" "{\"success\": false, \"message\": \"[im_quotejson $err_msg]\"}"
return
}
}
......@@ -185,7 +185,7 @@ ad_proc im_rest_project_task_tree_create {
# No project_id!
if {"" != $project_id && [db_string exists_p "select count(*) from im_projects where project_id=:project_id"]} {
ns_log Error "im_rest_project_task_tree_create: Create failed, project_id=$project_id already exists. JSON data: $var_hash_list"
doc_return 409 "text/plain" "{success:false, message: 'Create failed, project_id=$project_id already exists. JSON data: [im_quotejson $var_hash_list]'}"
doc_return 409 "text/plain" "{\"success\": false, \"message\": \"Create failed, project_id=$project_id already exists. JSON data: [im_quotejson $var_hash_list]\"}"
return
}
......@@ -193,7 +193,7 @@ ad_proc im_rest_project_task_tree_create {
if {[info exists var_hash(parent_id)]} { set parent_id $var_hash(parent_id) }
if {"" == $parent_id} {
ns_log Error "im_rest_project_task_tree_create: Create failed, no parent_id specified for new task in post data: $var_hash_list"
doc_return 400 "text/plain" "{success:false, message: 'Create failed, no parent_id specified for new task in post data: [im_quotejson $var_hash_list]'}"
doc_return 400 "text/plain" "{\"success\": false, \"message\": \"Create failed, no parent_id specified for new task in post data: [im_quotejson $var_hash_list]\"}"
return
}
......@@ -201,7 +201,7 @@ ad_proc im_rest_project_task_tree_create {
${parent_object_type}_permissions $current_user_id $parent_id view read write admin
if {!$write} {
ns_log Error "im_rest_project_task_tree_create: No permissions to write to parent_id=$parent_id for user=$current_user_id"
doc_return 401 "text/plain" "{success:false, message: 'No permissions to write to parent_id=$parent_id for user=$current_user_id'}"
doc_return 401 "text/plain" "{\"success\": false, \"message\": \"No permissions to write to parent_id=$parent_id for user=$current_user_id\"}"
return
}
......
tcl/intranet-rest-post-procs.tcl
View file @ 291c81aa
......@@ -77,7 +77,7 @@ ad_proc -private im_rest_post_object_type {
}
set data "\[{[join $data_list ", "]}\]"
set result "{\"success\": \"true\",\"message\": \"Object created\",\"data\": $data}"
set result "{\"success\": true,\"message\": \"Object created\",\"data\": $data}"
doc_return 200 "application/json" $result
}
default {
......@@ -195,7 +195,7 @@ ad_proc -private im_rest_post_object {
}
set data "\[{[join $data_list ", "]}\]"
set result "{\"success\": \"true\",\"message\": \"Object updated\",\"data\": $data}"
set result "{\"success\": true,\"message\": \"Object updated\",\"data\": $data}"
doc_return 200 "application/json" $result
}
}
......@@ -279,7 +279,7 @@ ad_proc -private im_rest_post_object_im_hour {
}
set data "\[{[join $data_list ", "]}\]"
set result "{\"success\": \"true\",\"message\": \"Object updated\",\"data\": $data}"
set result "{\"success\": true,\"message\": \"Object updated\",\"data\": $data}"
doc_return 200 "application/json" $result
}
}
......@@ -356,7 +356,7 @@ ad_proc -private im_rest_post_object_im_hour_interval {
}
set data "\[{[join $data_list ", "]}\]"
set result "{\"success\": \"true\",\"message\": \"Object updated\",\"data\": $data}"
set result "{\"success\": true,\"message\": \"Object updated\",\"data\": $data}"
doc_return 200 "application/json" $result
}
}
......@@ -453,7 +453,7 @@ ad_proc -private im_rest_delete_object {
"
}
json {
set result "{\"success\": \"true\",\"message\": \"Object deleted\"}"
set result "{\"success\": true,\"message\": \"Object deleted\"}"
doc_return 200 "application/json" $result
}
}
......
tcl/intranet-rest-procs.tcl
View file @ 291c81aa
......@@ -180,7 +180,7 @@ ad_proc -private im_rest_page {
}
set result [ad_parse_template -params $params $file]
# set result "{success:false, message: 'ad_parse_template -params $params $file'}"
# set result "{\"success\": false, \"message\": \"ad_parse_template -params $params $file\"}"
switch $format {
json { set mime_type "application/json" }
......
www/data-source/auto-login-token.tcl
View file @ 291c81aa
......@@ -34,12 +34,12 @@ if {[info exists result_array(user_id)]} { set user_id $result_array(user_id) }
if {"ok" == $account_status && 0 != $user_id} {
ad_user_login -forever=0 $user_id
set token [im_generate_auto_login -user_id $user_id -expiry_date $expiry_date]
doc_return 200 "text/json" "{'success': true, 'message': 'success', 'token': '$token'}"
doc_return 200 "text/json" "{\"success\": true, \"message\": \"success\", \"token\": \"$token\"}"
ad_script_abort
} else {
set auth_message $result_array(auth_message)
doc_return 200 "text/json" "{'success': false, 'message': '$auth_message'}"
doc_return 200 "text/json" "{\"success\": false, \"message\": \"$auth_message\"}"
ad_script_abort
}
www/data-source/domain-proxy.tcl
View file @ 291c81aa
......@@ -28,5 +28,6 @@ ns_log Notice "/intranet-rest/data-source/domain-proxy.tcl: url=$url"
if {[catch {
set json [im_httpget $url]
} err_msg]} {
set json "{'success': false, 'message': 'Error message: $err_msg'}"
set json "{\"success\": false, \"message\": \"Error message: $err_msg\"}"
}
www/data-source/next-object-id.adp
View file @ 291c81aa
{'success': true, 'message': 'success', 'data': {'object_id': <%= [im_new_object_id] %>}}
{"success": true, "message": "success", "data": {"object_id": <%= [im_new_object_id] %>}}
www/data-source/project-task-tree-action.adp
View file @ 291c81aa
{success:@success@, message: '@message@'}
\ No newline at end of file
{"success": "@success@", "message": "@message@"}
\ No newline at end of file
www/data-source/success.adp
View file @ 291c81aa
{'success': true, 'message': 'success'}
{"success": true, "message": "success"}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment