Dev: Tweaked Edit Survey

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11887 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 4, 2012 · 8104539 · 8104539
1 parent c26ffac
commit 8104539
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/application/controllers/admin/surveyaction.php b/application/controllers/admin/surveyaction.php
@@ -129,8 +129,6 @@ function editsurveysettings($surveyid)
 
         $this->_registerScriptFiles();
 
-        self::_surveybar($surveyid);
-
         //Yii::app()->loadHelper('text');
         Yii::app()->loadHelper('surveytranslator');
         $clang = $this->getController()->lang;
@@ -461,7 +459,7 @@ public function deactivate($surveyid = null)
             $survey->active = 'N';
             $survey->save();
 
-            $prow = Survey::model()->getSomeRecords('savetimings', array('sid' => $postsid));
+            $prow = Survey::model()->find('sid = :sid', array(':sid' => $postid));
             if ($prow->savetimings == "Y")
             {
                 $oldtable = "{{survey_{$postsid}_timings}}";
@@ -1102,7 +1100,7 @@ private function _fetchSurveyInfo($action, $surveyid=null)
         elseif ($action == 'editsurvey')
         {
             $condition = array('sid' => $surveyid);
-            $esresult = Survey::model()->getOneRecord(array('sid' => $surveyid));
+            $esresult = Survey::model()->find('sid = :sid', array(':sid' => $surveyid));
             if ($esresult)
             {
                 $esrow = $esresult;

diff --git a/application/views/admin/survey/editSurvey_view.php b/application/views/admin/survey/editSurvey_view.php
@@ -26,7 +26,7 @@
     if (bHasSurveyPermission($surveyid,'surveysettings','update'))
     {?>
     <p><button onclick="if (UpdateLanguageIDs(mylangs,'<?php $clang->eT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js");?>')) {$('#addnewsurvey').submit();}" class='standardbtn' ><?php $clang->eT("Save"); ?></button></p>
-    <p><button onclick="if (UpdateLanguageIDs(mylangs,'<?php $clang->eT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js");?>')) { document.getElementById('surveysettingsaction').value = 'updatesurveysettingsandeditlocalesettings'; $('#addnewsurvey').submit();}" class='standardbtn' ><?php $clang->eT("Save & edit survey text elements");?> >></button></p><?php
+    <p><button onclick="if (UpdateLanguageIDs(mylangs,'<?php $clang->eT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js");?>')) { document.getElementById('surveysettingsaction').value = 'updatesurveysettingsandeditlocalesettings'; $('#addnewsurvey').submit();}" class='standardbtn' ><?php $clang->eT("Save & edit survey text elements");?> >></button></p><br /><?php
 }?>
 <div id='dlgEditParameter'>
     <div id='dlgForm' class='form30'>