Changeset 304

Timestamp:

Jan 4, 2010, 11:05:37 AM (15 years ago)

Author:

george

Message:

• Opraveno: Řazení dle sloupce Pořadí u tabulky výběru překladatelů pro Export.

Location:

trunk

Files:

• export/index.php (modified) (2 diffs)
• includes/global_function.php (modified) (1 diff)

trunk/export/index.php

@@ -175 +175 @@
   );  
   $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
+  if($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
+    else $InitialOrder = '';
 
   $Columns = '';
@@ -186 +188 @@
   $Query = 'SELECT (@I := @I + 1) AS Sequence2, TT.* FROM (SELECT ExportUser.Sequence, T.ID, T.TranslatedCount, T.user, T.XP FROM (SELECT user.ID, user.user, user.XP, ('.substr($Columns, 0, -3).') as TranslatedCount FROM `user`'.$Joins.') AS T';
   $Query .=' LEFT JOIN ExportUser ON ExportUser.Export = '.$_GET['ExportId'].' AND ExportUser.User=T.ID';
-  $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(ExportUser.Sequence, 100000000), '.substr($Order['SQL'], 10).') AS TT';
+  $Query .=' WHERE T.TranslatedCount > 0 ORDER BY COALESCE(ExportUser.Sequence, 100000000)'.$InitialOrder.') AS TT';
 
   $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');

trunk/includes/global_function.php

@@ -132 +132 @@
   return(array(
     'SQL' => ' ORDER BY '.$_SESSION['OrderCol'].' '.$OrderDirSQL[$_SESSION['OrderDir']],
-    'Output' => '<tr>'.$Result.'</tr>')
-  );
+    'Output' => '<tr>'.$Result.'</tr>',
+    'Column' => $_SESSION['OrderCol'],
+    'Direction' => $_SESSION['OrderDir'],
+  ));
 }