From 1106cd89b88788cac1f1f3c14e17a288c7843af3 Mon Sep 17 00:00:00 2001 From: Guillermo Date: Fri, 5 Jul 2019 17:56:03 -0300 Subject: [PATCH] edit-comment log --- client/src/app-components/activity-row.js | 4 +++- .../src/app/admin/panel/dashboard/admin-panel-activity.js | 4 ++-- client/src/data/languages/en.js | 1 + server/controllers/staff/last-events.php | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/src/app-components/activity-row.js b/client/src/app-components/activity-row.js index 09806081..612df91a 100644 --- a/client/src/app-components/activity-row.js +++ b/client/src/app-components/activity-row.js @@ -57,7 +57,8 @@ class ActivityRow extends React.Component { 'CREATE_TICKET', 'RE_OPEN', 'DEPARTMENT_CHANGED', - 'PRIORITY_CHANGED' + 'PRIORITY_CHANGED', + 'EDIT_COMMENT', ]; return ( @@ -101,6 +102,7 @@ class ActivityRow extends React.Component { 'RE_OPEN': 'unlock-alt', 'DEPARTMENT_CHANGED': 'exchange', 'PRIORITY_CHANGED': 'exclamation', + 'EDIT_COMMENT': 'edit', 'EDIT_SETTINGS': 'wrench', 'SIGNUP': 'user-plus', diff --git a/client/src/app/admin/panel/dashboard/admin-panel-activity.js b/client/src/app/admin/panel/dashboard/admin-panel-activity.js index 608cd3c7..9ced3300 100644 --- a/client/src/app/admin/panel/dashboard/admin-panel-activity.js +++ b/client/src/app/admin/panel/dashboard/admin-panel-activity.js @@ -43,7 +43,7 @@ class AdminPanelActivity extends React.Component { ); } - + getMenuProps() { return { className: 'admin-panel-activity__menu', @@ -148,4 +148,4 @@ class AdminPanelActivity extends React.Component { } } -export default AdminPanelActivity; \ No newline at end of file +export default AdminPanelActivity; diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index 6e6781de..6373f738 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -228,6 +228,7 @@ export default { 'ACTIVITY_RE_OPEN': 'reopened ticket', 'ACTIVITY_DEPARTMENT_CHANGED': 'changed department of ticket', 'ACTIVITY_PRIORITY_CHANGED': 'changed priority of ticket', + 'ACTIVITY_EDIT_COMMENT': 'edited a comment of ticket', 'ACTIVITY_EDIT_SETTINGS': 'edited settings', 'ACTIVITY_SIGNUP': 'signed up', diff --git a/server/controllers/staff/last-events.php b/server/controllers/staff/last-events.php index 8d03d630..ce4ef67c 100755 --- a/server/controllers/staff/last-events.php +++ b/server/controllers/staff/last-events.php @@ -14,10 +14,10 @@ use Respect\Validation\Validator as DataValidator; * @apiPermission staff1 * * @apiParam {Number} page The page number. - * + * * @apiUse NO_PERMISSION * @apiUse INVALID_PAGE - * + * * @apiSuccess {[TicketEvent](#api-Data_Structures-ObjectTicketevent)[]} data Array of last events * */ @@ -56,4 +56,4 @@ class LastEventsStaffController extends Controller { Response::respondSuccess([]); } } -} \ No newline at end of file +}