From 621664f02eb70736560c51f0b323de747de65c07 Mon Sep 17 00:00:00 2001
From: Gabriel Jenik <gabriel.jenik@gmail.com>
Date: Mon, 8 Feb 2021 09:00:00 -0300
Subject: [PATCH] Fixed issue #17010: Admin personal setting not implemented
 (#1740)

Default question type & Lock question organizer are fixed.
---
 application/controllers/QuestionAdministrationController.php | 2 +-
 application/models/QuestionCreate.php                        | 2 +-
 application/views/layouts/sidemenu.php                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/QuestionAdministrationController.php b/application/controllers/QuestionAdministrationController.php
index 19cbe3b1721..8907d523c31 100644
--- a/application/controllers/QuestionAdministrationController.php
+++ b/application/controllers/QuestionAdministrationController.php
@@ -88,7 +88,7 @@ public function actionCreate($surveyid)
             throw new Exception('Internal error: Found no survey with id ' . $surveyid);
         }
 
-        $oQuestion = $this->getQuestionObject(null, 'F', null);
+        $oQuestion = $this->getQuestionObject(null, null, null);
         $oQuestion->sid = $surveyid;
 
         $this->aData['showSaveAndNewGroupButton'] = true;
diff --git a/application/models/QuestionCreate.php b/application/models/QuestionCreate.php
index bee31f6d367..33a7925f9bb 100644
--- a/application/models/QuestionCreate.php
+++ b/application/models/QuestionCreate.php
@@ -8,7 +8,7 @@ class QuestionCreate extends Question
     /**
      * @todo This is a factory method, not a singleton. Rename to make() or create().
      */
-    public static function getInstance($iSurveyId, $type)
+    public static function getInstance($iSurveyId, $type = null)
     {
         $oSurvey = Survey::model()->findByPk($iSurveyId);
         if (empty($oSurvey)) {
diff --git a/application/views/layouts/sidemenu.php b/application/views/layouts/sidemenu.php
index 5aae9e804fc..9c2aed06ba6 100644
--- a/application/views/layouts/sidemenu.php
+++ b/application/views/layouts/sidemenu.php
@@ -56,7 +56,7 @@
             basemenus: '.json_encode($menuObjectArray).',
             updateOrderLink: "'.$updateOrderLink.'",
             unlockLockOrganizerUrl: "'.$unlockLockOrganizerUrl.'",
-            allowOrganizer: '.(SettingsUser::getUserSettingValue('lock_organizer') ? '1' : '0').',
+            allowOrganizer: '.(SettingsUser::getUserSettingValue('lock_organizer') ? '0' : '1').',
             translate: '
             .json_encode(
                 [