fix #34 & sort additional fields

KIMB-technologies · Jan 7, 2020 · 1a3bd5e · 1a3bd5e
1 parent 1d9f89f
commit 1a3bd5e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 latest
-1.2.1
+1.2.2
 1.2
 1
diff --git a/core/PollAdmin.php b/core/PollAdmin.php
@@ -83,7 +83,7 @@ private function doDelete(){
 				header( 'Location: ' . URL::generateLink() );
 				die();
 			}
-			else{
+			else if( !empty($_SESSION['DELETE_SUBMISSIONS_CODE']) && $_GET['delete'] == $_SESSION['DELETE_SUBMISSIONS_CODE'] ){
 				$this->pollsub->setArray(array());
 			}
 		}
@@ -162,10 +162,12 @@ private function showInfo(){
 			$this->template->setMultipleContent('Additionals', $additionals);
 		}
 
+		$_SESSION['DELETE_SUBMISSIONS_CODE'] = Utilities::randomCode(6, Utilities::POLL_ID);
+
 		$this->template->setContent( 'JSONDATA', str_replace( array("\\r", "\\n"), array( "\\\\r", "\\\\n"), json_encode(
 			array(
 				"delallurl" => URL::currentLinkGenerator( array( 'delete' => 'all' ) ),
-				"delsuburl" => URL::currentLinkGenerator( array( 'delete' => 'sub' ) ),
+				"delsuburl" => URL::currentLinkGenerator( array( 'delete' => $_SESSION['DELETE_SUBMISSIONS_CODE'] ) ),
 				"polladmin" => URL::generateLink('admin', '', $this->polldata->getValue(['code', 'admin'])),
 				"meta" => array(  $this->polldata->getValue(['pollname']), $this->polldata->getValue(['description']) ),
 				"terminmeta" => $terminmeta,

diff --git a/core/Utilities.php b/core/Utilities.php
@@ -16,7 +16,7 @@ class Utilities {
 	/**
 	 * The system's Version
 	 */
-	const SYS_VERSION = 'v1.2.1';
+	const SYS_VERSION = 'v1.2.2';
 
 	/**
 	 * Possible chars for:

diff --git a/load/main.js b/load/main.js
@@ -560,7 +560,8 @@ function template_admin(){
 		$("button#saveadditionalinputs").prop('disabled', true);
 	}
 	else {
-		$("ul#listofadditionals li span.additionals-delete").click(removeAdditionalInput)
+		$("ul#listofadditionals li span.additionals-delete").click(removeAdditionalInput);
+		$( "ul#listofadditionals" ).sortable({ items: "> li.additionals-element" });
 	}
 }