Merge branch 'task/zoho-L41-T351-reset-question-theme'

LimeSurvey · Feb 12, 2021 · c5c1953 · c5c1953
2 parents 372badb + 59fb34f
commit c5c1953
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/application/controllers/ThemeOptionsController.php b/application/controllers/ThemeOptionsController.php
@@ -118,20 +118,22 @@ public function actionCreate()
     public function actionResetMultiple()
     {
         $aTemplates = json_decode(App()->request->getPost('sItems'));
-        $gridid = App()->request->getPost('gridvalue');
+        $gridid = App()->request->getPost('grididvalue');
         $aResults = array();
 
-        if (Permission::model()->hasGlobalPermission('templates', 'updates')) {
+        if (Permission::model()->hasGlobalPermission('template', 'update')) {
             foreach ($aTemplates as $template) {
-                $model = $this->loadModel($template, $gridid);
 
                 if ($gridid === 'questionthemes-grid') {
+                    /** @var  $model QuestionTheme */
+                    $model = QuestionTheme::model()->findByPk($template);
                     $templatename = $model->name;
                     $templatefolder = $model->xml_path;
                     $aResults[$template]['title'] = $templatename;
                     $sQuestionThemeName = $model->importManifest($templatefolder);
                     $aResults[$template]['result'] = isset($sQuestionThemeName) ? true : false;
                 } elseif ($gridid === 'themeoptions-grid') {
+                    $model = TemplateConfiguration::model()->findByPk($template);
                     $templatename = $model->template_name;
                     $aResults[$template]['title'] = $templatename;
                     $aResults[$template]['result'] = TemplateConfiguration::uninstall($templatename);
@@ -152,7 +154,8 @@ public function actionResetMultiple()
                 )
             );
         } else {
-            App()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."), 'error');
+            //todo: this message gets never visible for the user ...
+           App()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."), 'error');
         }
     }
 

diff --git a/application/views/themeOptions/_selector.php b/application/views/themeOptions/_selector.php
@@ -30,7 +30,7 @@
                 'modalType'     => 'yes-no',
                 'keepopen'      => 'yes',
                 'showSelected'  => 'yes',
-                'selectedUrl'   => App()->createUrl('themeOptions/renderSelectedItems/'),
+                'selectedUrl'   => App()->createUrl('themeOptions/selectedItems/'),
                 'yes'           => gT('Reset Themes'),
                 'no'            => gT('Cancel'),
                 'sModalTitle'   => gT('Reset theme'),
@@ -51,7 +51,7 @@
                 'modalType'     => 'yes-no',
                 'keepopen'      => 'yes',
                 'showSelected'  => 'yes',
-                'selectedUrl'   => App()->createUrl('themeOptions/renderSelectedItems/'),
+                'selectedUrl'   => App()->createUrl('themeOptions/selectedItems/'),
                 'sModalTitle'   => gT('Uninstall themes'),
                 'htmlModalBody' => gT('Are you sure you want to uninstall the selected themes?'),
             )