From b70c66b4b3c73931269ed4fa256d82a7414e4fc5 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sat, 30 Jun 2018 17:34:42 +0200 Subject: [PATCH] Fixed issue #13833: Owner of survey are not able to edit assesments (no button) Dev: just use the good Permission Dev: remove data-toggle='tooltip' : no tooltip are shown (FF60) Dev: remove onclick, type='button' does nothing when clciked (except launc click event) Dev: add sr-only (but maybe just for fun, admin part are not tested against A11Y --- application/models/Assessment.php | 39 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/application/models/Assessment.php b/application/models/Assessment.php index 7862b91f3c0..310a4ed2935 100644 --- a/application/models/Assessment.php +++ b/application/models/Assessment.php @@ -81,30 +81,31 @@ public function getButtons() { $buttons = "
"; $raw_button_template = "" - . ""; - - if (Permission::model()->hasGlobalPermission('assessments', 'update')) { - $editData = array( - 'action_assessments_editModal', - 'text-danger', - gT("Edit this assessment rule"), - 'edit' - ); - $deleteData = array( - 'action_assessments_deleteModal', - 'text-danger', - gT("Delete this assessment rule"), - 'trash text-danger' - ); - + $editData = array( + 'action_assessments_editModal', + 'text-info', + gT("Edit this assessment rule"), + 'edit', + gT("Edit") + ); + $deleteData = array( + 'action_assessments_deleteModal', + 'text-danger', + gT("Delete this assessment rule"), + 'trash text-danger', + gT("Delete") + ); + if (Permission::model()->hasSurveyPermission($this->sid,'assessments', 'delete')) { $buttons .= vsprintf($raw_button_template, $deleteData); + } + if (Permission::model()->hasSurveyPermission($this->sid,'assessments', 'update')) { $buttons .= vsprintf($raw_button_template, $editData); } - $buttons .= '
'; - + return $buttons; }