Changeset 12224


Ignore:
Timestamp:
09/25/11 16:58:39 (8 years ago)
Author:
grum
Message:

bug:2438 - order defined for metadata is not applied

Location:
extensions/AMetaData
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/AMetaData/admin/amd_metadata_display.tpl

    r6950 r12224  
    7777                } 
    7878              ); 
    79             list=list.substr(0, list.lastIndexOf(';')); 
     79            //list=list.substr(0, list.lastIndexOf(';')); 
    8080            $.ajax( 
    8181              { 
  • extensions/AMetaData/amd_pip.class.inc.php

    r7700 r12224  
    113113      'values' => array(), 
    114114    ); 
    115     $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus 
     115    $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus, st.order AS tOrder, gr.order as gOrder 
    116116          FROM ((".$this->tables['selected_tags']." st 
    117117            LEFT JOIN ".$this->tables['groups']." gr 
     
    122122              ON ut.tagId = st.tagId 
    123123          WHERE gn.lang='".$user['language']."' 
    124             AND st.groupId <> -1 
    125           ORDER BY gr.order, st.order) 
     124            AND st.groupId <> -1) 
    126125 
    127126          UNION 
    128127 
    129           (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n' 
     128          (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n', -1, -1 
    130129          FROM ((".$this->tables['selected_tags']." st2 
    131130            LEFT JOIN ".$this->tables['used_tags']." ut2 ON ut2.tagId = st2.tagId) 
     
    133132            LEFT JOIN ".$this->tables['used_tags']." ut3 ON ut3.numId = pautd.value 
    134133          WHERE st2.tagId LIKE 'userDefined.%' 
    135           AND pautd.type = 'M');"; 
     134          AND pautd.type = 'M') 
     135 
     136          ORDER BY gOrder, tOrder;"; 
    136137 
    137138    $result=pwg_query($sql); 
  • extensions/AMetaData/main.inc.php

    r12223 r12224  
    214214|         |            |   . Incompatibility with IE 
    215215|         |            | 
    216 |         |            | 
    217 |         |            | 
     216|         |            | * mantis bug:2438 
     217|         |            |   . order defined for metadata is not applied 
    218218|         |            | 
    219219|         |            | 
Note: See TracChangeset for help on using the changeset viewer.