From 5d9797d69b04796355bcd1a0592312d2282c4857 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 25 Oct 2022 09:55:08 +0200
Subject: [PATCH] =?UTF-8?q?Nastavitve=20vpra=C5=A1anja=20-=20popravek=20od?=
 =?UTF-8?q?stranjenih=20nastavitev=20zaradi=20kompatibilnosti=20za=20nazaj?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/classes/class.Vprasanje.php | 77 +++++++++++++-----------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index b02311b26..fc3f69ab0 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -1236,9 +1236,9 @@ class Vprasanje {
 		//echo '<p class="heading">'.$lang['srv_prikaz_vprasanja'].'</p>';
 		$this->edit_visible();
 		
-		// Disabled vprasanje - vprasanje je onemogoceno za respondente (zaenkrat samo osnovni radio, dropdown in text) - ODSTRANJENO
-		/*if(in_array($row['tip'], array(1,3,4,21)))
-			$this->edit_disabled();*/
+		// Disabled vprasanje - vprasanje je onemogoceno za respondente (zaenkrat samo osnovni radio, dropdown in text)
+		if(in_array($row['tip'], array(1,3,4,21)))
+			$this->edit_disabled();
 
 		// Vprasanje lahko zaklene samo admin, manager ali avtor (drugace ga lahko zaklene sam sebi in potem ne more vec urejat)
 		$author = SurveyInfo::getInstance()->getSurveyColumn("insert_uid");
@@ -1253,17 +1253,15 @@ class Vprasanje {
 		if ($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20)
 			$this->edit_grid_dynamic();
 		
-        // ODSTRANJENO
-		/*if ($row['tip'] == 1 || $row['tip'] == 6) {
+		if ($row['tip'] == 1 || $row['tip'] == 6) {
 			$this->edit_onchange_submit();
-		}*/
+		}
 		
 		if ($row['tip'] == 1 || $row['tip'] == 3)
 			$this->edit_inline_edit();
 				
-        // ODSTRANJENO
-		/*if ($row['tip'] != 5)
-			$this->edit_showOnAllPages();*/
+		if ($row['tip'] != 5)
+			$this->edit_showOnAllPages();
 		
 		if ($row['tip'] == 1 || $row['tip'] == 2 && (in_array($row['orientation'], array(0,1,2))))
 			$this->edit_hideRadio();
@@ -2433,15 +2431,19 @@ class Vprasanje {
 		$spremenljivkaParams = new enkaParameters($row['params']);
 		$disabled_vprasanje = ($spremenljivkaParams->get('disabled_vprasanje') ? $spremenljivkaParams->get('disabled_vprasanje') : 0);
 
-		echo '<div class="vprasanje_setting_holder">';
+        // ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
+        if($disabled_vprasanje == '1'){
 
-        echo '  <div class="vprasanje_setting_line">';
-		echo '      <input type="hidden" name="disabled_vprasanje" value="0" />';
-		echo '      <input type="checkbox" id="disabled_vprasanje" name="disabled_vprasanje" value="1" '.(($disabled_vprasanje == 1) ? ' checked="checked" ' : '').' />';		
-		echo '      <label for="disabled_vprasanje">'.$lang['srv_disabled'].' '.Help::display('srv_disabled_question').'</label>';
-		echo '  </div>';
+            echo '<div class="vprasanje_setting_holder">';
 
-		echo '</div>';	
+            echo '  <div class="vprasanje_setting_line">';
+            echo '      <input type="hidden" name="disabled_vprasanje" value="0" />';
+            echo '      <input type="checkbox" id="disabled_vprasanje" name="disabled_vprasanje" value="1" '.(($disabled_vprasanje == 1) ? ' checked="checked" ' : '').' />';		
+            echo '      <label for="disabled_vprasanje">'.$lang['srv_disabled'].' '.Help::display('srv_disabled_question').'</label>';
+            echo '  </div>';
+
+            echo '</div>';	
+        }
 	}
 	
 	/**
@@ -4728,16 +4730,20 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		// pri multigridu ga prikazemo samo ce imamo vklopljeno postopno resevanje
-        echo '<div id="onchange_submit_div" class="vprasanje_setting_holder" '.($row['dynamic_mg']==0 && $row['tip']!=1 && $row['orientation']>2 ? ' style="display:none;"':'').'>';
-        
-        echo '  <div class="vprasanje_setting_line">';
-		echo '      <input type="hidden" value="0" name="onchange_submit" />';
-		echo '      <input type="checkbox" value="1" id="onchange_submit" name="onchange_submit" '.($row['onchange_submit']==1?' checked="checked"':'').' />';
-		echo '      <label for="onchange_submit" class="title">'.$lang['srv_onchange_submit'].'</label>';
-		echo '  </div>';
+        // ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
+        if($row['onchange_submit'] == '1'){
 
-		echo '</div>';
+            // pri multigridu ga prikazemo samo ce imamo vklopljeno postopno resevanje
+            echo '<div id="onchange_submit_div" class="vprasanje_setting_holder" '.($row['dynamic_mg']==0 && $row['tip']!=1 && $row['orientation']>2 ? ' style="display:none;"':'').'>';
+            
+            echo '  <div class="vprasanje_setting_line">';
+            echo '      <input type="hidden" value="0" name="onchange_submit" />';
+            echo '      <input type="checkbox" value="1" id="onchange_submit" name="onchange_submit" '.($row['onchange_submit']==1?' checked="checked"':'').' />';
+            echo '      <label for="onchange_submit" class="title">'.$lang['srv_onchange_submit'].'</label>';
+            echo '  </div>';
+
+            echo '</div>';
+        }
 	}
 	
 	function edit_hidden_default() {
@@ -4822,16 +4828,19 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 
-        echo '<div class="vprasanje_setting_holder">';
-        
-        echo '  <div class="vprasanje_setting_line">';
-		echo '      <input type="hidden" value="0" name="showOnAllPages" />';
-		echo '      <input type="checkbox" value="1" id="showOnAllPages" name="showOnAllPages" '.($row['showOnAllPages']==1?' checked="checked"':'').' />';
-		echo '      <label for="showOnAllPages">'.$lang['srv_showOnAllPages_edit'].'</label>';
-        echo '  </div>';
+        // ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
+        if($row['showOnAllPages'] == '1'){
+            
+            echo '<div class="vprasanje_setting_holder">';
+            
+            echo '  <div class="vprasanje_setting_line">';
+            echo '      <input type="hidden" value="0" name="showOnAllPages" />';
+            echo '      <input type="checkbox" value="1" id="showOnAllPages" name="showOnAllPages" '.($row['showOnAllPages']==1?' checked="checked"':'').' />';
+            echo '      <label for="showOnAllPages">'.$lang['srv_showOnAllPages_edit'].'</label>';
+            echo '  </div>';
 
-		echo '</div>';
-		
+            echo '</div>';
+        }
 	}
 	
 	function edit_hideRadio () {