Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -149,6 +149,9 @@
 --------------------------------------------------------------------------------
 - new version 5.16.2 of fine uploader
 - obey max_upload_size whenever a file is uploaded
+- do not list documents in task list, if a previous version is still in workflow.
+  Take only the lastest version into account (Closes: #405)
+- fix moving documents in clipboard into folder by drag&drop
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.16

inc/inc.ClassViewCommon.php

@@ -69,6 +69,16 @@ class SeedDMS_View_Common {
 		return null;
 	}
 
+	/**
+	 * Check if the view has a parameter with the given name
+	 *
+	 * @param string $name name of parameter
+	 * @return boolean true if parameter exists otherwise false
+	 */
+	function hasParam($name) {
+		return isset($this->params[$name]) ? true : false;
+	}
+
 	public function unsetParam($name) {
 		if(isset($this->params[$name]))
 			unset($this->params[$name]);

styles/bootstrap/application.js

@@ -758,7 +758,7 @@ $(document).ready(function() { /* {{{ */
 		attr_rel = $(e.currentTarget).data('droptarget');
 		target_type = attr_rel.split("_")[0];
 		target_id = attr_rel.split("_")[1];
-		target_name = $(e.currentTarget).data('name')
+		target_name = $(e.currentTarget).data('name')+''; // Force this to be a string
 		if(target_type == 'folder') {
 			var files = e.originalEvent.dataTransfer.files;
 			if(files.length > 0) {
@@ -769,7 +769,7 @@ $(document).ready(function() { /* {{{ */
 				source_type = source_info.type;
 				source_id = source_info.id;
 				formtoken = source_info.formtoken;
-				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
+//				console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
 				if(source_type == 'document') {
 					var bootbox_message = trans.confirm_move_document;
 					if(source_info.name)
@@ -956,7 +956,7 @@ $(document).ready(function() { /* {{{ */
 			id : attr_rel.split("_")[1],
 			type : "folder",
 			formtoken : $(e.target).attr('formtoken'),
-			name: $(e.target).data('name')
+			name: $(e.target).data('name')+''
 		};
 		/* Currently not used
 		$.ajax({url: '../out/out.ViewFolder.php',
@@ -982,7 +982,7 @@ $(document).ready(function() { /* {{{ */
 			id : attr_rel.split("_")[1],
 			type : "document",
 			formtoken : $(e.target).attr('formtoken'),
-			name: $(e.target).data('name')
+			name: $(e.target).data('name')+''
 		};
 		e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
 	});

views/bootstrap/class.Clipboard.php

@@ -61,7 +61,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {

views/bootstrap/class.ErrorDlg.php

@@ -37,6 +37,7 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
 		$pagetitle = $this->params['pagetitle'];
 		$errormsg = $this->params['errormsg'];
 		$plain = $this->params['plain'];
+		$showbutton = $this->hasParam('nobackbutton') === false || $this->getParam('nobackbutton') === false;
 		$settings = $this->params['settings'];
 
 		if(!$plain) {
@@ -49,7 +50,8 @@ class SeedDMS_View_ErrorDlg extends SeedDMS_Bootstrap_Style {
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($errormsg);
 		print "</div>";
-		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
+		if($showbutton)
+			print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
 		
 		$this->contentEnd();
 		$this->htmlEndPage();