summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Exceptions/messages/messages.txt7
-rw-r--r--framework/Web/Services/TJsonService.php2
3 files changed, 8 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index dc1c49f9..04fdd673 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,7 @@ BUG: TActiveLinkButton and TActiveRadioButtonList crashes if it's the only activ
ENH: Issue#36 - Refactored TRatingList/TActiveRatingList, and added some docs (Bradley)
ENH: Issue#52 - Upgraded to TinyMCE 3.2.1
ENH: Issue#72 - Add wildcard support to TUrlMapping (friendly-urls) (Michael)
+ENH: Issue#77 - TJsonService missing exception messages (Carl)
NEW: Issue#51 - Additional template tag (Carl)
Version 3.1.3 November 1, 2008
diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt
index 549b21bf..fc2b63f1 100644
--- a/framework/Exceptions/messages/messages.txt
+++ b/framework/Exceptions/messages/messages.txt
@@ -408,6 +408,11 @@ soapservice_serverid_duplicated = SOAP server ID '{0}' is duplicated.
soapserver_id_invalid = Invalid SOAP server ID '{0}'. It should not end with '.wsdl'.
soapserver_version_invalid = Invalid SOAP version '{0}'. It must be either '1.1' or '1.2'.
+jsonservice_id_required = TJsonService requires 'id' attribute in its JSON elements.
+jsonservice_response_type_invalid = JSON class {0} is invalid. It should be TJsonResponse or extend from TJsonResponse.
+jsonservice_class_required = TJsonService requires 'class' attribute in its JSON elements.
+jsonservice_provider_unknown = Unknown JSON provider '{0}' requested.
+
dbusermanager_userclass_required = TDbUserManager.UserClass is required.
dbusermanager_userclass_invalid = TDbUserManager.UserClass '{0}' is not a valid user class. The class must extend TDbUser.
dbusermanager_connectionid_invalid = TDbUserManager.ConnectionID '{0}' does not point to a valid TDataSourceConfig module.
@@ -467,4 +472,4 @@ datasource_dbconnection_invalid = TDataSourceConfig.DbConnection '{0}' is inva
response_status_reason_missing = HTTP 1.1 need reason for extended status-codes
response_status_reason_badchars = For HTTP 1.1 header, the token status-reason must not contain token CR or LF
-activefileupload_temppath_invalid = TActiveFileUpload TempPath path '{0}' does not exist or is not writable by Web server process. \ No newline at end of file
+activefileupload_temppath_invalid = TActiveFileUpload TempPath path '{0}' does not exist or is not writable by Web server process.
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index 93ad10d2..e3ed9a7f 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -92,7 +92,7 @@ class TJsonService extends TService
throw new TConfigurationException('jsonservice_class_required',$id);
}
else
- throw new THttpException(404,'jsonservice_feed_unknown',$id);
+ throw new THttpException(404,'jsonservice_provider_unknown',$id);
}
/**