From 8fd19944a4260bdcf8d1a8fdc83171bcaad6e7a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Sep 2016 11:31:03 +0200
Subject: [PATCH 1/3] getAttributes() orders attributes by attr def name

---
 SeedDMS_Core/Core/inc.ClassObject.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassObject.php b/SeedDMS_Core/Core/inc.ClassObject.php
index 91c731b38..10fa89755 100644
--- a/SeedDMS_Core/Core/inc.ClassObject.php
+++ b/SeedDMS_Core/Core/inc.ClassObject.php
@@ -75,13 +75,13 @@ class SeedDMS_Core_Object { /* {{{ */
 
 			switch(get_class($this)) {
 				case "SeedDMS_Core_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 "SeedDMS_Core_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 "SeedDMS_Core_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;

From b2181441f3859167878c2f6b0e9f7ad06825f83a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Sep 2016 11:34:29 +0200
Subject: [PATCH 2/3] new version 4.3.29

---
 SeedDMS_Core/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 83ebe9ced..78aee711e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-08-24</date>
+ <date>2016-09-06</date>
  <time>10:18:59</time>
  <version>
-  <release>4.3.28</release>
-  <api>4.3.28</api>
+  <release>4.3.29</release>
+  <api>4.3.29</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- SeedDMЅ_Core_DMS::search() searches also comment of document version
+- SeedDMЅ_Core_Object::getAttributes() orders attributes by name of attribute definition
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1017,5 +1017,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - 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>
  </changelog>
 </package>

From a08965ebd5e94d73c6c33b0d5be1677e396097ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Sep 2016 11:34:46 +0200
Subject: [PATCH 3/3] add entry for 4.3.29

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d9d6f8d52..c84fd9ef5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,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