diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index f375d54ac6f..ec25188ed4f 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -764,7 +764,7 @@ function _surveybar($aData) // Survey permission item $aData['surveysecurity'] = Permission::model()->hasSurveyPermission($iSurveyID, 'surveysecurity', 'read'); // CHANGE QUESTION GROUP ORDER BUTTON - $aData['surveycontent'] = Permission::model()->hasSurveyPermission($iSurveyID, 'surveycontent', 'read'); + $aData['surveycontentread'] = Permission::model()->hasSurveyPermission($iSurveyID, 'surveycontent', 'read'); $aData['groupsum'] = (getGroupSum($iSurveyID, $surveyinfo['language']) > 1); // SET SURVEY QUOTAS BUTTON $aData['quotas'] = Permission::model()->hasSurveyPermission($iSurveyID, 'quotas', 'read'); @@ -784,13 +784,19 @@ function _surveybar($aData) // Only show survey properties menu if at least one item is permitted $aData['showSurveyPropertiesMenu'] = - $aData['surveylocale'] + $aData['surveylocale'] || $aData['surveysettings'] || $aData['surveysecurity'] - || $aData['surveycontent'] + || $aData['surveycontentread'] || $aData['quotas'] || $aData['assessments']; + // Only show tools menu if at least one item is permitted + $aData['showToolsMenu'] = + $aData['surveydelete'] + || $aData['surveytranslate'] + || Permission::model()->hasSurveyPermission($iSurveyID, 'surveycontent', 'update'); + $iConditionCount = Condition::model()->with(Array('questions'=>array('condition'=>'sid ='.$iSurveyID)))->count(); $aData['surveycontent'] = Permission::model()->hasSurveyPermission($iSurveyID, 'surveycontent', 'update'); diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php index 8926f0d073a..bfe93d5a51c 100644 --- a/application/views/admin/survey/surveybar_view.php +++ b/application/views/admin/survey/surveybar_view.php @@ -205,7 +205,7 @@ - + @@ -225,17 +225,17 @@ - - - -
  • - - - - -
  • - - + + + +
  • + + + + +
  • + + @@ -248,100 +248,102 @@ - +