From: Banana <mail@bananas-playground.net>
Date: Sun, 26 Nov 2023 11:37:08 +0000 (+0100)
Subject: fixed bulkedit
X-Git-Tag: 1.6~15
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=247573b1f392b7e4d31b76ab8f2f394a71eada99;p=bibliotheca-php.git

fixed bulkedit
---

diff --git a/CHANGELOG b/CHANGELOG
index 2a2c3ea..311f4f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
     * Fixed: #26 98 theme. max column with
     * Fixed: #25 98 design. Sort direction select does not show the correct selected option
     * Fixed: #23 basic search result order
+    * Fixed: Buledit in 98 theme and default
 
 1.5 - Sacred Passage 2023-05-01
     * Added google books parser. See upgrade file for more infos.
diff --git a/TODO b/TODO
index c75ceea..2dd355a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
-* fix bulkedit
 * change multiple-attachment to a field which tells it is used for a image gallery
 * update JS and remove deprecations
 * complete profile view. Groups still missing.
diff --git a/webclient/lib/manageentry.class.php b/webclient/lib/manageentry.class.php
index 7025717..f1ea406 100644
--- a/webclient/lib/manageentry.class.php
+++ b/webclient/lib/manageentry.class.php
@@ -188,7 +188,7 @@ class Manageentry {
 				}
 			}
 
-			if(DEBUG) Summoner::sysLog("[DEBUG] ".__METHOD__." queryData: ".Summoner::sysLog($queryData));
+			if(DEBUG) Summoner::sysLog("[DEBUG] ".__METHOD__." queryData: ".Summoner::cleanForLog($queryData));
 
 			if(!empty($queryData['init']) || ($update !== false && is_numeric($update))) {
 
diff --git a/webclient/view/98/advancedsearch/advancedsearch.html b/webclient/view/98/advancedsearch/advancedsearch.html
index aad8b14..1ce7933 100644
--- a/webclient/view/98/advancedsearch/advancedsearch.html
+++ b/webclient/view/98/advancedsearch/advancedsearch.html
@@ -85,10 +85,10 @@
 		</form>
 
 		<div class="sunken-panel">
-			<table width="100">
+			<table width="100%">
 				<thead>
 				<tr>
-					<th>View</th>
+					<th width="60px">View</th>
 					<?php
 					foreach($TemplateData['collectionFields'] as $f) {
 						if(in_array($f['id'],$TemplateData['loadedCollection']['advancedSearchTableFields'])) {
diff --git a/webclient/view/98/bulkedit/bulkedit.html b/webclient/view/98/bulkedit/bulkedit.html
new file mode 100644
index 0000000..dbab5d3
--- /dev/null
+++ b/webclient/view/98/bulkedit/bulkedit.html
@@ -0,0 +1,34 @@
+<h3 class="uk-h3">Bulkedit these entries in: <a href="index.php?p=colletions&collection<?php echo $TemplateData['loadedCollection']['id']; ?>"><?php echo $TemplateData['loadedCollection']['name']; ?></a></h3>
+
+<?php if(!empty($TemplateData['itemsToWorkWith'])) { ?>
+
+<ul>
+	<?php foreach($TemplateData['itemsToWorkWith'] as $entry) { ?>
+	<li><a href="index.php?p=entry&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&id=<?php echo $entry['id']; ?>"><?php echo $entry['title']; ?></a></li>
+	<?php } ?>
+</ul>
+
+<form class="maxSizeForm" method="post" enctype="multipart/form-data">
+	<?php foreach($TemplateData['itemsToWorkWith'] as $entry) { ?>
+	<input type="hidden" name="bulkedit[]" value="<?php echo $entry['id']; ?>" />
+	<?php } ?>
+
+<?php
+	foreach($TemplateData['editFields'] as $field) {
+		$field['bulkedit'] = true;
+		$_editFieldView = Summoner::themefile('manageentry/field-'.$field['type'].'.html', UI_THEME);
+		if(file_exists($_editFieldView)) {
+			require $_editFieldView;
+		}
+		else {
+			require $TemplateData['_editFieldViewDefault'];
+		}
+	}
+?>
+	<div class="field-row-stacked">
+		<input type="submit" name="submitForm" value="Save">
+	</div>
+
+</form>
+<script type="text/javascript" src="view/default/ui/js/suggest-tag.js"></script>
+<?php } ?>
diff --git a/webclient/view/default/advancedsearch/advancedsearch.php b/webclient/view/default/advancedsearch/advancedsearch.php
index b1d6d5e..db96a3f 100644
--- a/webclient/view/default/advancedsearch/advancedsearch.php
+++ b/webclient/view/default/advancedsearch/advancedsearch.php
@@ -56,7 +56,7 @@ if(!empty($_collection)) {
 				}
 
 				if (!empty($_search) && Summoner::validate($_search)) {
-					if (strstr($_search, ':')) { // field search
+					if (str_contains($_search, ':')) { // field search
 						$_matches = array();
 						if(preg_match_all("/(\p{L}+:)(?(?!\p{L}+:).)*/u",$_search, $_matches) !== false && !empty($_matches[0])) {
 							// $matches[0] has the identifier: and text
diff --git a/webclient/view/default/bulkedit/bulkedit.php b/webclient/view/default/bulkedit/bulkedit.php
index 31b152d..056a10c 100644
--- a/webclient/view/default/bulkedit/bulkedit.php
+++ b/webclient/view/default/bulkedit/bulkedit.php
@@ -89,10 +89,10 @@ if(!empty($_collection)) {
 							switch ($data['bulkeditMethod']) {
 								case 'add':
 									if(is_array($entry[$ident])) { // lookup multiple
-										$data['valueToSave'] = implode(",", $entry[$ident]) . $data['valueToSave'];
-									}
+										$data['valueToSave'] = implode(",", $entry[$ident]).",".$data['valueToSave'];
+                                    }
 									else {
-										$data['valueToSave'] = $entry[$ident] . $data['valueToSave'];
+										$data['valueToSave'] = $entry[$ident].' '.$data['valueToSave'] ;
 									}
 								break;
 
@@ -114,6 +114,8 @@ if(!empty($_collection)) {
 						} else {
 							$_messages[] = "Entry could not be updated. See log for more details: ".$entry['id'];
 						}
+
+						unset($data);
 					}
 
 					$TemplateData['message']['content'] = implode("<br />",$_messages);