Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Shnoulle committed Jun 30, 2018
1 parent 43c0883 commit b70c66b
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions application/models/Assessment.php
Expand Up @@ -81,30 +81,31 @@ public function getButtons()
{
$buttons = "<div style='white-space: nowrap'>";
$raw_button_template = ""
. "<button class='btn btn-default btn-xs %s %s' role='button' data-toggle='tooltip' title='%s' onclick='return false;'>" //extra class //title
. "<i class='fa fa-%s' ></i>" //icon class
. "<button class='btn btn-default btn-xs %s %s' role='button' title='%s' type='button'>" //extra class //title
. "<i class='fa fa-%s' aria-hidden='true' ></i><span class='sr-only'>%s</span>" //icon class
. "</button>";
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 .= '</div>';

return $buttons;
}

Expand Down

0 comments on commit b70c66b

Please sign in to comment.