Dev: Add groupid to importQuestion view

LimeSurvey · Mar 21, 2016 · ae67adc · ae67adc
1 parent 4eee562
commit ae67adc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -136,7 +136,7 @@ public function view($surveyid, $gid, $qid)
     /**
      * Display import view
      */
-    public function importView($surveyid)
+    public function importView($groupid, $surveyid)
     {
         $iSurveyID = $surveyid = sanitize_int($surveyid);
         if (Permission::model()->hasSurveyPermission($surveyid,'surveycontent','import'))
@@ -146,6 +146,7 @@ public function importView($surveyid)
             $aData['surveybar']['closebutton']['url'] = '/admin/survey/sa/listquestiongroups/surveyid/'.$iSurveyID;  // Close button
             $aData['surveybar']['savebutton']['form'] = true;
             $aData['surveyid'] = $surveyid;
+            $aData['groupid'] = $groupid;
             $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
             $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
 
@@ -909,6 +910,7 @@ public function newquestion($surveyid)
             $eqrow['gid'] = $_GET['gid'];
         }
         $aData['eqrow'] = $eqrow;
+        $aData['groupid'] = $eqrow['gid'];
 
         $sumresult1 = Survey::model()->findByPk($surveyid);
         if (is_null($sumresult1))

diff --git a/application/views/admin/survey/Question/importQuestion_view.php b/application/views/admin/survey/Question/importQuestion_view.php
@@ -20,7 +20,7 @@
                     <label class="col-sm-2 control-label" for='the_file'><?php eT("Question group:"); ?></label>
                     <div class="col-sm-3">
                         <select name='gid' id='gid' class="form-control">
-                            <?php echo getGroupList3($eqrow['gid'],$surveyid); ?>
+                            <?php echo getGroupList3($groupid, $surveyid); ?>
                         </select>         
                     </div>           
                 </div>

diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php
@@ -560,7 +560,7 @@
 
             <?php endif;?>
             <?php if(isset($surveybar['importquestion'])):?>
-                <a class="btn btn-default" href="<?php echo Yii::App()->createUrl('admin/questions/sa/importview/surveyid/'.$surveyid);?>" role="button">
+                <a class="btn btn-default" href="<?php echo Yii::App()->createUrl('admin/questions/sa/importview/groupid/'.$groupid.'/surveyid/'.$surveyid);?>" role="button">
                     <span class="icon-import"></span>
                     <?php eT('Import a question'); ?>
                 </a>