Jelajahi Sumber

fixed Export fields order

Piotr Labudda 7 tahun lalu
induk
melakukan
9f60c2282c

+ 18 - 0
SE/se-lib/Core/AclHelper.php

@@ -32,6 +32,7 @@ class Core_AclHelper {// Helper class for Acl
 		// 	$fieldPerms[ $field['name'] ] = $field['perms'];
 		// }
 		$permsForFields = User::getAcl()->getPermsForTable($acl->getID());
+		uasort($permsForFields, [ self, 'sortFieldsPermInfoCallback' ]);
 		foreach ($permsForFields as $idField => $permInfo) {
 			// $permInfo = Array:
 			//     [ID_CELL] => 763
@@ -61,6 +62,23 @@ class Core_AclHelper {// Helper class for Acl
 		}
 		return $fieldPerms;
 	}
+	static function sortFieldsPermInfoCallback($a, $b) { // @see TableAcl::sortFieldsCallback
+		if ($a['CELL_NAME'] == 'ID') {
+			return -1;
+		}
+		else if ($b['CELL_NAME'] == 'ID') {
+			return 1;
+		}
+		else if ($a['SORT_PRIO'] < $b['SORT_PRIO']) {
+			return -1;
+		}
+		else if ($a['SORT_PRIO'] > $b['SORT_PRIO']) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
 
 	public static function getExportFieldList($acl) {
 		$exportFields = array();

+ 1 - 1
SE/se-lib/TableAjax.php.TableAjax.js

@@ -2222,7 +2222,7 @@ var TableAjax = function() {
 
 			var li;
 			li = $('<li></li>').appendTo(ul);
-			$('<a href="index.php" target="_blank" class=""><i class="glyphicon glyphicon-share"></i>Export do HTML</a>').appendTo(li);
+			$('<a href="index.php" target="_blank" class=""><i class="glyphicon glyphicon-share"></i>Podgląd <em style="font-size:85%">(HTML)</em></a>').appendTo(li);
 			li.on('click', 'a', priv.exportToHTML);
 			li = $('<li></li>').appendTo(ul);
 			$('<a href="index.php" target="_blank" class=""><i class="glyphicon glyphicon-share"></i>Export do CSV</a>').appendTo(li);

+ 0 - 3
SE/se-lib/UserAcl.php

@@ -408,9 +408,6 @@ class UserAcl {
 				order by z.`SORT_PRIO`
 		";
 		$userPermsForTable = array();
-		// $db = DB::getDB();
-		// $res = $db->query($tableCellToProcesSql);
-		// while ($h = $db->fetch_assoc($res)) {
 		foreach (DB::getPDO()->fetchAll($tableCellToProcesSql) as $h) {
 			$idCell = $h['ID_CELL'];
 			$userPermsForTable[$idCell] = $h;