Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -50,6 +50,8 @@
 - move guest authentication from inc/inc.ClassDbAuthentication.php into op/op.Login.php
 - use jquery.validate for form validation
 - new graph layout for workflow manager using cytoscape
+- show current workflow and highlight possible transitions on workflow tab
+  of ViewDocument page
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.28

SeedDMS_Core/Core/inc.ClassObject.php

@@ -75,13 +75,13 @@ class SeedDMS_Core_Object { /* {{{ */
 
 			switch(get_class($this)) {
 				case $this->_dms->getClassname('document'):
-					$queryStr = "SELECT * FROM tblDocumentAttributes WHERE document = " . $this->_id." ORDER BY `id`";
+					$queryStr = "SELECT a.* FROM tblDocumentAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.document = " . $this->_id." ORDER BY b.`name`";
 					break;
 				case $this->_dms->getClassname('documentcontent'):
-					$queryStr = "SELECT * FROM tblDocumentContentAttributes WHERE content = " . $this->_id." ORDER BY `id`";
+					$queryStr = "SELECT a.* FROM tblDocumentContentAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.content = " . $this->_id." ORDER BY b.`name`";
 					break;
 				case $this->_dms->getClassname('folder'):
-					$queryStr = "SELECT * FROM tblFolderAttributes WHERE folder = " . $this->_id." ORDER BY `id`";
+					$queryStr = "SELECT a.* FROM tblFolderAttributes a LEFT JOIN tblAttributeDefinitions b ON a.attrdef=b.id WHERE a.folder = " . $this->_id." ORDER BY b.`name`";
 					break;
 				default:
 					return false;

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-08-09</date>
+ <date>2016-09-06</date>
  <time>06:23:34</time>
  <version>
-  <release>5.0.5</release>
+  <release>5.0.6</release>
-  <api>5.0.5</api>
+  <api>5.0.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 4.3.28 merged
+- all changes from 4.3.29 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1041,6 +1041,55 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - add more callbacks
 	 </notes>
   </release>
+  <release>
+   <date>2016-04-26</date>
+   <time>12:04:59</time>
+   <version>
+    <release>4.3.27</release>
+    <api>4.3.27</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- callbacks can have more then one user function
+- fix some sql statements, because they didn't work with mysql 5.7.5 anymore
+   </notes>
+  </release>
+  <release>
+   <date>2016-08-24</date>
+   <time>10:18:59</time>
+   <version>
+    <release>4.3.28</release>
+    <api>4.3.28</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- SeedDMЅ_Core_DMS::search() searches also comment of document version
+   </notes>
+  </release>
+  <release>
+   <date>2016-09-06</date>
+   <time>10:18:59</time>
+   <version>
+    <release>4.3.29</release>
+    <api>4.3.29</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- SeedDMЅ_Core_Object::getAttributes() orders attributes by name of attribute definition
+   </notes>
+  </release>
   <release>
    <date>2016-01-22</date>
    <time>14:34:58</time>
@@ -1107,11 +1156,11 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </notes>
   </release>
   <release>
-   <date>2016-04-26</date>
+   <date>2016-05-03</date>
-   <time>12:04:59</time>
+   <time>08:56:33</time>
    <version>
-    <release>4.3.27</release>
+    <release>5.0.5</release>
-    <api>4.3.27</api>
+    <api>5.0.5</api>
    </version>
    <stability>
     <release>stable</release>
@@ -1119,16 +1168,15 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- callbacks can have more then one user function
+- all changes from 4.3.28 merged
-- fix some sql statements, because they didn't work with mysql 5.7.5 anymore
    </notes>
   </release>
   <release>
-   <date>2016-08-24</date>
+   <date>2016-08-09</date>
-   <time>10:18:59</time>
+   <time>06:23:34</time>
    <version>
-    <release>4.3.28</release>
+    <release>5.0.5</release>
-    <api>4.3.28</api>
+    <api>5.0.5</api>
    </version>
    <stability>
     <release>stable</release>
@@ -1136,7 +1184,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-  - all changes from 4.3.28 merged
+- all changes from 4.3.28 merged
    </notes>
   </release>
  </changelog>