Fixed issue #T136: Error Message Needs Rewording (#2135)

* Fixed issue #14557: User with very limited rights is allowed to set expiry date at survey list screen * Fixed issue #T136: Error Message Needs Rewording Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Nov 5, 2021 · 537092d · 537092d
1 parent b1921e7
commit 537092d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -59,10 +59,13 @@ public function deleteMultiple()
         $aSurveys = json_decode(Yii::app()->request->getPost('sItems'));
         $aResults = array();
         foreach ($aSurveys as $iSurveyID) {
+            $oSurvey                        = Survey::model()->findByPk($iSurveyID);
+            $aResults[$iSurveyID]['title']  = $oSurvey->correct_relation_defaultlanguage->surveyls_title;
             if (Permission::model()->hasSurveyPermission($iSurveyID, 'survey', 'delete')) {
-                $oSurvey                        = Survey::model()->findByPk($iSurveyID);
-                $aResults[$iSurveyID]['title']  = $oSurvey->correct_relation_defaultlanguage->surveyls_title;
                 $aResults[$iSurveyID]['result'] = Survey::model()->deleteSurvey($iSurveyID);
+            } else {
+                $aResults[$iSurveyID]['result'] = false;
+                $aResults[$iSurveyID]['error'] = gT("User does not have valid permissions");
             }
         }
 
@@ -366,7 +369,12 @@ public function changeMultipleSurveyGroup()
             $oSurvey = Survey::model()->findByPk($iSurveyID);
             $oSurvey->gsid = $iSurveyGroupId;
             $aResults[$iSurveyID]['title']  = $oSurvey->correct_relation_defaultlanguage->surveyls_title;
-            $aResults[$iSurveyID]['result']= $oSurvey->save();
+            if ($oSurvey->save()) {
+                $aResults[$iSurveyID]['result'] = true;
+            } else {
+                $aResults[$iSurveyID]['result'] = false;
+                $aResults[$iSurveyID]['error'] = gT("Survey update failed");
+            }
         }
 
         Yii::app()->getController()->renderPartial('ext.admin.survey.ListSurveysWidget.views.massive_actions._action_results', array('aResults'=>$aResults,'successLabel'=>gT("Success")));
@@ -396,6 +404,7 @@ public function changetemplate($iSurveyID, $template, $aResults = null, $bReturn
             if (!empty($bReturn)){
                 $aResults[$iSurveyID]['title']  = $survey->correct_relation_defaultlanguage->surveyls_title;
                 $aResults[$iSurveyID]['result'] = false;
+                $aResults[$iSurveyID]['error'] = gT("User does not have valid permissions");
                 return $aResults;
             }else{
                 die('No permission');
@@ -1999,13 +2008,15 @@ public function expireMultipleSurveys()
             // We check the permission after retrieving the title because we need it anyway.
             if (!Permission::model()->hasSurveyPermission($sid, 'surveysettings', 'update')) {
                 $aResults[$survey->primaryKey]['result'] = false;
+                $aResults[$survey->primaryKey]['error'] = gT("User does not have valid permissions");
                 continue;
             }
             $survey->expires = $expires;
             if ($survey->save()) {
                 $aResults[$survey->primaryKey]['result'] = true;
             } else {
                 $aResults[$survey->primaryKey]['result'] = false;
+                $aResults[$survey->primaryKey]['error'] = gT("Survey update failed");
             }
         }
         Yii::app()->getController()->renderPartial('ext.admin.survey.ListSurveysWidget.views.massive_actions._action_results', array('aResults'=>$aResults, 'successLabel'=>gT('OK')));

diff --git a/...ation/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_action_results.php b/...ation/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_action_results.php
@@ -30,7 +30,7 @@
                     </td>
                 <?php else: ?>
                     <td class="text-warning">
-                        <?php eT('Error'); ?>
+                        <?= empty($result['error']) ? gT('Error') : sprintf(gT("Unable to perform function - %s"), $result['error']) ?>
                     </td>
                 <?php endif;?>
             </tr>