- Fixed JSON return messages

www/project-eva.json.tcl

@@ -19,7 +19,7 @@ set current_user_id [ad_conn user_id]
 im_project_permissions $current_user_id $diagram_project_id view read write admin
 if {!$read} {
     set json "{\"success\": false, \"message\": \"Insufficient permissions - you need read permissions for project #$diagram_project_id.\" }"
-    doc_return 200 "text/html" $json
+    doc_return 400 "application/json" $json
     ad_script_abort
 }
 
@@ -246,5 +246,5 @@ foreach epoch $timeline_list {
 }
 
 set json "{\"success\": true, \"message\": \"$message\", \"data\": \[\n[join $json_lines ",\n"]\n\]}"
-doc_return 200 "text/html" $json
+doc_return 200 "application/json" $json
 

www/revenue-by-dept.json.tcl

@@ -35,7 +35,7 @@ ad_page_contract {
 set current_user_id [ad_conn user_id]
 if {![im_permission $current_user_id view_companies_all] || ![im_permission $current_user_id view_finance]} { 
     set json "{\"success\": false, \"message\": \"Insufficient permissions - you need view_companies_all and view_finance.\" }"
-    doc_return 200 "text/html" $json
+    doc_return 400 "application/json" $json
     ad_script_abort
 }
 
@@ -70,7 +70,7 @@ switch $diagram_interval {
     last_quarter { set diagram_start_date [db_string year "select now()::date - 90 - 31"] }
     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
     }
 }
@@ -200,5 +200,5 @@ foreach now $months {
 # ----------------------------------------------------
 
 set json "{\"success\": true, \"message\": \"Data loaded\", \"data\": \[\n[join $rev_rows ",\n"]\n\]}"
-doc_return 200 "text/html" $json
+doc_return 200 "application/json" $json
 

www/top-customers.json.tcl

@@ -20,7 +20,7 @@ ad_page_contract {
 set current_user_id [ad_conn user_id]
 if {![im_permission $current_user_id view_companies_all] || ![im_permission $current_user_id view_finance]} { 
     set json "{\"success\": false, \"message\": \"Insufficient permissions - you need view_companies_all and view_finance.\" }"
-    doc_return 200 "text/html" $json
+    doc_return 400 "application/json" $json
     ad_script_abort
 }
 
@@ -39,7 +39,7 @@ switch $diagram_interval {
     all_time { set top_customer_interval_sql "" }
     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
     }
 }
@@ -91,5 +91,5 @@ multirow foreach top_customers {
     lappend data_list "{\"name\": \"$customer_name\", \"value\": $customer_revenues }"
 }
 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