From 3f2157ac4e1a775995ad6ffa97f970fe7bae1f32 Mon Sep 17 00:00:00 2001 From: AntonyAntonio Date: Fri, 21 Apr 2017 00:34:20 -0300 Subject: [PATCH] Guillermo - things [skip ci] --- .../ticket/get-custom-responses.php | 3 +- server/data/ERRORS.php | 70 +++++++++---------- server/models/APIKey.php | 6 ++ server/models/Article.php | 9 +++ server/models/Ban.php | 6 ++ server/models/CustomResponse.php | 8 +++ server/models/Department.php | 8 +++ server/models/Log.php | 11 +++ server/models/MailTemplate.php | 9 +++ server/models/Staff.php | 12 ++++ server/models/Stat.php | 9 +++ server/models/Ticket.php | 40 +++++------ server/models/Ticketevent.php | 20 +++--- server/models/User.php | 9 +++ 14 files changed, 154 insertions(+), 66 deletions(-) diff --git a/server/controllers/ticket/get-custom-responses.php b/server/controllers/ticket/get-custom-responses.php index ae7fcc23..14cd8891 100644 --- a/server/controllers/ticket/get-custom-responses.php +++ b/server/controllers/ticket/get-custom-responses.php @@ -13,8 +13,9 @@ DataValidator::with('CustomValidations', true); * * @apiPermission Staff level 1 * - * @apiSuccess {Object} data + * @apiSuccess {[CustomResponse](#api-Data_Structures-ObjectCustomresponse)[]} data List of custom responses. * + * @apiUse NO_PERMISSION */ class GetCustomResponsesController extends Controller { diff --git a/server/data/ERRORS.php b/server/data/ERRORS.php index e1e817bd..435cc66a 100644 --- a/server/data/ERRORS.php +++ b/server/data/ERRORS.php @@ -33,143 +33,143 @@ */ /** * @apiDefine INVALID_NAME - * @apiError {String} INVALID_NAME Common error + * @apiError {String} INVALID_NAME The name is invalid, probably too short. */ /** * @apiDefine INVALID_SETTING - * @apiError {String} INVALID_SETTING Common error + * @apiError {String} INVALID_SETTING The setting are invalid. */ /** * @apiDefine INVALID_DEPARTMENT - * @apiError {String} INVALID_DEPARTMENT Common error + * @apiError {String} INVALID_DEPARTMENT The dapartment is invalid, probably too short. */ /** * @apiDefine INVALID_TICKET - * @apiError {String} INVALID_TICKET Common error + * @apiError {String} INVALID_TICKET The ticket is invalid. */ /** * @apiDefine INIT_SETTINGS_DONE - * @apiError {String} INIT_SETTINGS_DONE Common error + * @apiError {String} INIT_SETTINGS_DONE The init settings are already done. */ /** * @apiDefine INVALID_OLD_PASSWORD - * @apiError {String} INVALID_OLD_PASSWORD Common error + * @apiError {String} INVALID_OLD_PASSWORD The old password is invalid. */ /** * @apiDefine INVALID_CAPTCHA - * @apiError {String} INVALID_CAPTCHA Common error + * @apiError {String} INVALID_CAPTCHA The captcha is invalid. */ /** * @apiDefine INVALID_TICKET_EVENT - * @apiError {String} INVALID_TICKET_EVENT Common error + * @apiError {String} INVALID_TICKET_EVENT The ticket event is invalid. */ /** * @apiDefine INVALID_LANGUAGE - * @apiError {String} INVALID_LANGUAGE Common error + * @apiError {String} INVALID_LANGUAGE The language is invalid. */ /** * @apiDefine TICKET_ALREADY_ASSIGNED - * @apiError {String} TICKET_ALREADY_ASSIGNED Common error + * @apiError {String} TICKET_ALREADY_ASSIGNED The ticket is already assigned. */ /** * @apiDefine INVALID_PRIORITY - * @apiError {String} INVALID_PRIORITY Common error + * @apiError {String} INVALID_PRIORITY The priority is invalid. */ /** * @apiDefine INVALID_PAGE - * @apiError {String} INVALID_PAGE Common error + * @apiError {String} INVALID_PAGE The page is invalid. */ /** * @apiDefine INVALID_QUERY - * @apiError {String} INVALID_QUERY Common error + * @apiError {String} INVALID_QUERY The query is invalid. */ /** * @apiDefine INVALID_TOPIC - * @apiError {String} INVALID_TOPIC Common error + * @apiError {String} INVALID_TOPIC The topic is invalid. */ /** * @apiDefine INVALID_SEARCH - * @apiError {String} INVALID_SEARCH Common error + * @apiError {String} INVALID_SEARCH The search is invalid. */ /** * @apiDefine INVALID_ORDER - * @apiError {String} INVALID_ORDER Common error + * @apiError {String} INVALID_ORDER The order is invalid. */ /** * @apiDefine INVALID_USER - * @apiError {String} INVALID_USER Common error + * @apiError {String} INVALID_USER The user is invalid. */ /** * @apiDefine ALREADY_BANNED - * @apiError {String} ALREADY_BANNED Common error + * @apiError {String} ALREADY_BANNED It's already banned. */ /** * @apiDefine INVALID_LEVEL - * @apiError {String} INVALID_LEVEL Common error + * @apiError {String} INVALID_LEVEL The level is invalid. */ /** * @apiDefine ALREADY_A_STAFF - * @apiError {String} ALREADY_A_STAFF Common error + * @apiError {String} ALREADY_A_STAFF It's already a staff. */ /** * @apiDefine INVALID_STAFF - * @apiError {String} INVALID_STAFF Common error + * @apiError {String} INVALID_STAFF The staff is invalid. */ /** * @apiDefine SAME_DEPARTMENT - * @apiError {String} SAME_DEPARTMENT Common error + * @apiError {String} SAME_DEPARTMENT It's the same department. */ /** * @apiDefine INVALID_TOKEN - * @apiError {String} INVALID_TOKEN Common error + * @apiError {String} INVALID_TOKEN The token is invalid. */ /** * @apiDefine UNVERIFIED_USER - * @apiError {String} UNVERIFIED_USER Common error + * @apiError {String} UNVERIFIED_USER The user is not verified. */ /** * @apiDefine INVALID_TEMPLATE - * @apiError {String} INVALID_TEMPLATE Common error + * @apiError {String} INVALID_TEMPLATE The template is invalid. */ /** * @apiDefine INVALID_SUBJECT - * @apiError {String} INVALID_SUBJECT Common error + * @apiError {String} INVALID_SUBJECT The subject is invalid. */ /** * @apiDefine INVALID_BODY - * @apiError {String} INVALID_BODY Common error + * @apiError {String} INVALID_BODY The body is invalid. */ /** * @apiDefine USER_SYSTEM_DISABLED - * @apiError {String} USER_SYSTEM_DISABLED Common error + * @apiError {String} USER_SYSTEM_DISABLED The user system is disabled. */ /** * @apiDefine SYSTEM_USER_IS_ALREADY_DISABLED - * @apiError {String} SYSTEM_USER_IS_ALREADY_DISABLED Common error + * @apiError {String} SYSTEM_USER_IS_ALREADY_DISABLED The system user is already disabled. */ /** * @apiDefine SYSTEM_USER_IS_ALREADY_ENABLED - * @apiError {String} SYSTEM_USER_IS_ALREADY_ENABLED Common error + * @apiError {String} SYSTEM_USER_IS_ALREADY_ENABLED The system user is already enabled. */ /** * @apiDefine INVALID_PERIOD - * @apiError {String} INVALID_PERIOD Common error + * @apiError {String} INVALID_PERIOD The period is invalid. */ /** * @apiDefine NAME_ALREADY_USED - * @apiError {String} NAME_ALREADY_USED Common error + * @apiError {String} NAME_ALREADY_USED The name is already used. */ /** * @apiDefine INVALID_FILE - * @apiError {String} INVALID_FILE Common error + * @apiError {String} INVALID_FILE The file is invalid. */ /** * @apiDefine DATABASE_CONNECTION - * @apiError {String} DATABASE_CONNECTION Common error + * @apiError {String} DATABASE_CONNECTION It's a database connection error. */ /** * @apiDefine DATABASE_CREATION - * @apiError {String} DATABASE_CREATION Common error + * @apiError {String} DATABASE_CREATION It's a database creation error. */ class ERRORS { diff --git a/server/models/APIKey.php b/server/models/APIKey.php index 91218cac..a20cf11d 100644 --- a/server/models/APIKey.php +++ b/server/models/APIKey.php @@ -1,4 +1,10 @@