A new survey can be made now! Few minor issues in common_helper and f…

…ew html errors now fixed! git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10328 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 22, 2011 · 1466830 · 1466830
1 parent d4b8434
commit 1466830
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 130 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
diff --git a/application/controllers/admin/survey.php b/application/controllers/admin/survey.php
@@ -688,12 +688,17 @@ function _tabPresentationNavigation($esrow)
             $esrow['navigationdelay']=0;
         }
 
-        $shownoanswer = isset($shownoanswer)?$shownoanswer:'Y';
+        $this->load->helper('globalsettings');
+
+        $shownoanswer = getGlobalSetting('shownoanswer')?getGlobalSetting('shownoanswer'):'Y';
 
         $data['clang'] = $clang;
         $data['esrow'] = $esrow;
         //$data['surveyid'] = $surveyid;
         $data['shownoanswer'] = $shownoanswer;
+        $data['showXquestions'] = $showXquestions;
+        $data['showgroupinfo'] = $showgroupinfo;
+        $data['showqnumcode'] = $showqnumcode;
         return $this->load->view('admin/survey/superview/SuperPresentation_view',$data, true); 
 
     }

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -27,7 +27,10 @@
 
 function aGetBaseSurveyPermissions()
 {
-    global $clang;
+    //global $clang;
+    $CI =& get_instance();
+    $clang = $CI->limesurvey_lang;
+
     $aPermissions=array(                                                
                     'assessments'=>array('create'=>true,'read'=>true,'update'=>true,'delete'=>true,'import'=>false,'export'=>false,'title'=>$clang->gT("Assessments"),'description'=>$clang->gT("Permission to create/view/update/delete assessments rules for a survey"),'img'=>'assessments'),  // Checked
                     'quotas'=>array('create'=>true,'read'=>true,'update'=>true,'delete'=>true,'import'=>false,'export'=>false,'title'=>$clang->gT("Quotas"),'description'=>$clang->gT("Permission to create/view/update/delete quota rules for a survey"),'img'=>'quota'), // Checked
@@ -42,6 +45,7 @@ function aGetBaseSurveyPermissions()
                     'tokens'=>array('create'=>true,'read'=>true,'update'=>true,'delete'=>true,'import'=>true,'export'=>true,'title'=>$clang->gT("Tokens"),'description'=>$clang->gT("Permission to create/update/delete/import/export token entries"),'img'=>'tokens'), 
                     'translations'=>array('create'=>false,'read'=>true,'update'=>true,'delete'=>false,'import'=>false,'export'=>false,'title'=>$clang->gT("Quick translation"),'description'=>$clang->gT("Permission to view & update the translations using the quick-translation feature"),'img'=>'translate')
                     );
+
    uasort($aPermissions,"aComparePermission");    
    return $aPermissions;                 
 }

diff --git a/application/models/survey_permissions_model.php b/application/models/survey_permissions_model.php
@@ -29,5 +29,15 @@ function getSomeRecords($fields,$condition=FALSE)
 
 		return $data;
 	}
+
+    function deleteSomeRecords($condition)
+    {
+        $this->db->delete('survey_permissions', $condition); 
+    }
+
+    function insertSomeRecords($data)
+    {
+        $this->db->insert('survey_permissions', $data); 
+    }
 
 }
diff --git a/application/models/surveys_languagesettings_model.php b/application/models/surveys_languagesettings_model.php
@@ -73,7 +73,7 @@ function getAllData($sid,$lcode)
 
     function insertNewSurvey($data)
     {
-        $this->db->insert('surveys', $data); 
+        $this->db->insert('surveys_languagesettings', $data); 
     }
 
 }
diff --git a/application/views/admin/Survey/subview/tab_view.php b/application/views/admin/Survey/subview/tab_view.php
@@ -8,7 +8,7 @@
         <li><a href='#import'><?php echo $clang->gT("Import"); ?></a></li>
         <li><a href='#copy'><?php echo $clang->gT("Copy"); ?></a></li>
     </ul>
-    <form class='form30' name='addnewsurvey' id='addnewsurvey' action='../index' method='post' onsubmit="alert('hi');return isEmpty(document.getElementById('surveyls_title'), '<?php echo $clang->gT("Error: You have to enter a title for this survey.", 'js'); ?> ');" >
+    <form class='form30' name='addnewsurvey' id='addnewsurvey' action='<?php echo site_url("admin/database/index/insertsurvey"); ?>' method='post' onsubmit="alert('hi');return isEmpty(document.getElementById('surveyls_title'), '<?php echo $clang->gT("Error: You have to enter a title for this survey.", 'js'); ?> ');" >
     <div id='general'>
     <ul><li>