From bfb7f22beea0147471c6035df7b236a74ac6d430 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 17 Nov 2020 09:53:56 +0100
Subject: [PATCH] Popravek avtomatskega prestevilcevanja pri kopiranju bloka z
 vsebino (prej se nad 50 vprasanj ni vec prestevilcilo)

---
 admin/survey/BranchingAjax.php        |  2 +-
 admin/survey/classes/class.Common.php |  8 ++----
 admin/survey/script/branching.js      | 37 ---------------------------
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 0f50220a6..723f355c4 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -182,7 +182,7 @@ class BranchingAjax {
 			
         $b->repare_vrstni_red();
         
-		Common::getInstance()->prestevilci($spremenljivka, $all);
+		Common::getInstance()->prestevilci($spremenljivka, $all=true);
 		
 		// Zacasno shranimo zadnji ustvarjen if, da vemo katerega odpreti
 		echo '<input type="hidden" id="temp_new_if_id" name="temp_new_if_id" value="'.$if_id.'" />';
diff --git a/admin/survey/classes/class.Common.php b/admin/survey/classes/class.Common.php
index 84f8db941..a901453f9 100644
--- a/admin/survey/classes/class.Common.php
+++ b/admin/survey/classes/class.Common.php
@@ -55,7 +55,8 @@ class Common {
 	static function prestevilci ($spremenljivka = 0, $all = false, $force = false) {
 
 		// Preverimo ce imamo izklopljeno atomatsko prestevilcevanje
-		SurveySetting::getInstance()->Init(self::$anketa);
+        SurveySetting::getInstance()->Init(self::$anketa);
+        
 		$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
 		if($enumerate == 0 && $all != true)
 			return;
@@ -66,7 +67,6 @@ class Common {
 
 			$i = 1;
 
-			//sisplet_query("BEGIN");
 			$sql = sisplet_query("SELECT s.id, variable, variable_custom, s.tip AS tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".self::$anketa."' AND s.tip!='9' ORDER BY g.vrstni_red, s.vrstni_red");
 
 			// ce je vec kot 50 spremenljivk nimamo avtomatskega prestevilcevanja
@@ -107,8 +107,6 @@ class Common {
 				$variable_array2 = $variable_array;
 
 				// Loop cez vsa vprasanja v anketi po vrstnem redu
-				//mysqli_data_seek($sql, 0);
-				//while ($row = mysqli_fetch_array($sql)) {
 				foreach($variable_array2 as $row) {
 
 					// Ce vprasanje nima custom variable jo lahko prestevilcimo
@@ -141,8 +139,6 @@ class Common {
 					array_push($val_array, $row['id']);
 				}
 
-				//sisplet_query("COMMIT");
-
 				// prestevilcimo se variable znotraj posameznih vprasanja - prestevilci moramo poklicati sele za zgornjim INSERTom!
 				foreach ($val_array AS $key => $val) {
 					self::prestevilci($val);
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 85befc093..0448062ef 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -378,45 +378,8 @@ function branching_click(event) {
 
     /* inline edit vprasanja */
     inline_bind_click(event);
-
-    /* to smo dal (zaenkrat) ven
-     // opcije na levi
-     // dodajanje spremenljivke
-     if (ta.is('a.newspr')) {
-     var spr = ta.parent().attr('spr');
-     var _if = ta.parent().attr('if');
-     var endif = ta.parent().attr('endif');
-     spremenljivka_new(spr, _if, endif);
-     return false;
-     }
-
-     // dodajanje ifa
-     if (ta.is('a.newif')) {
-     var spr = ta.parent().attr('spr');
-     var _if = ta.parent().attr('if');
-     var endif = ta.parent().attr('endif');
-     if_new(spr, _if, endif, '0');
-     return false;
-     }
-
-     // dodajanje bloka (tip=1)
-     if (ta.is('a.newblock')) {
-     var spr = ta.parent().attr('spr');
-     var _if = ta.parent().attr('if');
-     var endif = ta.parent().attr('endif');
-     if_new(spr, _if, endif, '1');
-     return false;
-     }
-
-     // pagebreak
-     if (ta.is('a.pb')) {
-     var spr = ta.parent().attr('spr');
-     pagebreak(spr);
-     return false;
-     }*/
 	
     return false;
-
 }
 
 // pohendla mouseoverje, ki se lovijo nad branchingom