Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed issue #10829: Survey admins presented with inappropriate control
buttons

Dev: Hide edit buttons in question group list if user lacks permission.
  • Loading branch information
olleharstedt committed Apr 15, 2016
1 parent 9797975 commit 327dd94
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions application/models/QuestionGroup.php
Expand Up @@ -212,20 +212,30 @@ public function getbuttons()
$oSurvey=Survey::model()->findByPk($this->sid);
$surveyIsActive = $oSurvey->active !== 'N';
$baselang = $oSurvey->language;
$button = '';

// Add question to this group
$url = Yii::app()->createUrl("admin/questions/sa/newquestion/surveyid/$this->sid/gid/$this->gid");
$button = '<a class="btn btn-default list-btn ' . ($surveyIsActive ? 'disabled' : '') . ' " data-toggle="tooltip" data-placement="left" title="'.gT('Add new question to group').'" href="'.$url.'" role="button"><span class="glyphicon glyphicon-plus-sign " ></span></a>';
if (Permission::model()->hasSurveyPermission($this->sid, 'surveycontent', 'update'))
{
$url = Yii::app()->createUrl("admin/questions/sa/newquestion/surveyid/$this->sid/gid/$this->gid");
$button .= '<a class="btn btn-default list-btn ' . ($surveyIsActive ? 'disabled' : '') . ' " data-toggle="tooltip" data-placement="left" title="'.gT('Add new question to group').'" href="'.$url.'" role="button"><span class="glyphicon glyphicon-plus-sign " ></span></a>';
}

// Group edition
// Edit
$url = Yii::app()->createUrl("admin/questiongroups/sa/edit/surveyid/$this->sid/gid/$this->gid");
$button .= ' <a class="btn btn-default list-btn" href="'.$url.'" role="button" data-toggle="tooltip" title="'.gT('Edit group').'"><span class="glyphicon glyphicon-pencil " ></span></a>';
if (Permission::model()->hasSurveyPermission($this->sid, 'surveycontent', 'update'))
{
$url = Yii::app()->createUrl("admin/questiongroups/sa/edit/surveyid/$this->sid/gid/$this->gid");
$button .= ' <a class="btn btn-default list-btn" href="'.$url.'" role="button" data-toggle="tooltip" title="'.gT('Edit group').'"><span class="glyphicon glyphicon-pencil " ></span></a>';
}

// View summary
$url = Yii::app()->createUrl("/admin/questiongroups/sa/view/surveyid/");
$url .= '/'.$this->sid.'/gid/'.$this->gid;
$button .= ' <a class="btn btn-default list-btn" href="'.$url.'" role="button" data-toggle="tooltip" title="'.gT('Group summary').'"><span class="glyphicon glyphicon-list-alt " ></span></a>';
if (Permission::model()->hasSurveyPermission($this->sid, 'surveycontent', 'read'))
{
$url = Yii::app()->createUrl("/admin/questiongroups/sa/view/surveyid/");
$url .= '/'.$this->sid.'/gid/'.$this->gid;
$button .= ' <a class="btn btn-default list-btn" href="'.$url.'" role="button" data-toggle="tooltip" title="'.gT('Group summary').'"><span class="glyphicon glyphicon-list-alt " ></span></a>';
}

$iQuestionsInGroup = Question::model()->countByAttributes(array('sid' => $this->sid, 'gid' => $this->gid, 'language' => $baselang));

Expand Down

0 comments on commit 327dd94

Please sign in to comment.