Changeset 12224

Timestamp:

Sep 25, 2011, 4:58:39 PM (13 years ago)

Author:

grum

Message:

bug:2438 - order defined for metadata is not applied

Location:

extensions/AMetaData

Files:

• admin/amd_metadata_display.tpl (modified) (1 diff)
• amd_pip.class.inc.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/AMetaData/admin/amd_metadata_display.tpl

@@ -77 +77 @@
                 }
               );
-            list=list.substr(0, list.lastIndexOf(';'));
+            //list=list.substr(0, list.lastIndexOf(';'));
             $.ajax(
               {

extensions/AMetaData/amd_pip.class.inc.php

@@ -113 +113 @@
       'values' => array(),
     );
-    $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus
+    $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus, st.order AS tOrder, gr.order as gOrder
           FROM ((".$this->tables['selected_tags']." st
             LEFT JOIN ".$this->tables['groups']." gr
@@ -122 +122 @@
               ON ut.tagId = st.tagId
           WHERE gn.lang='".$user['language']."'
-            AND st.groupId <> -1
-          ORDER BY gr.order, st.order)
+            AND st.groupId <> -1)
 
           UNION
 
-          (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n'
+          (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n', -1, -1
           FROM ((".$this->tables['selected_tags']." st2
             LEFT JOIN ".$this->tables['used_tags']." ut2 ON ut2.tagId = st2.tagId)
@@ -133 +132 @@
             LEFT JOIN ".$this->tables['used_tags']." ut3 ON ut3.numId = pautd.value
           WHERE st2.tagId LIKE 'userDefined.%'
-          AND pautd.type = 'M');";
+          AND pautd.type = 'M')
+
+          ORDER BY gOrder, tOrder;";
 
     $result=pwg_query($sql);

extensions/AMetaData/main.inc.php

@@ -214 +214 @@
 |         |            |   . Incompatibility with IE
 |         |            |
-|         |            |
-|         |            |
+|         |            | * mantis bug:2438
+|         |            |   . order defined for metadata is not applied
 |         |            |
 |         |            |