Changeset 316

Timestamp:

Feb 1, 2010, 10:22:32 PM (14 years ago)

Author:

george

Message:

• Opraveno: Zobrazení jmen překladatelů ve výpisech překladů.

Location:

trunk

Files:

• TranslationList.php (modified) (4 diffs)
• team.php (modified) (2 diffs)

trunk/TranslationList.php

@@ -35 +35 @@
       '<td>'.GetVersionWOW($Line['VersionStart']).'-'.GetVersionWOW($Line['VersionEnd']).'</td>');
     if($Action == 'selection') echo('<td>'.$Line['CountQuest'].'</td>'); 
-      else if($Action <> 'notran') echo('<td>'.$Line['User'].'</td>');
+      else if($Action <> 'notran') echo('<td>'.$Line['UserName'].'</td>');
     echo('</tr>');
   }
@@ -97 +97 @@
         <strong>Vypsání nedokončených textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT * FROM '.$Table.' AS items WHERE (items.Language = 0) AND
-    NOT EXISTS(SELECT 1 FROM '.$Table.' AS sub WHERE (sub.Language <> 0) AND (sub.entry = items.entry)  AND (sub.Complete = 1) AND VersionEnd = "'.$BuildNumber_max.'") AND
-   EXISTS(SELECT 1 FROM '.$Table.' AS sub WHERE (sub.Language <> 0) AND (sub.entry = items.entry)  AND (sub.Complete = 0) AND VersionEnd = "'.$BuildNumber_max.'") AND VersionEnd = "'.$BuildNumber_max.'"');
+  WriteQuests('SELECT `items`.*, `user`.`user` AS `UserName` FROM `'.$Table.'` AS `items` JOIN `user` ON `user`.`id` = `items`.`User` WHERE (`items`.`Language` = 0) AND
+    NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`entry` = `items`.`entry`) AND (`sub`.`Complete` = 1) AND (`VersionEnd` = '.$BuildNumber_max.')) AND
+   EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub2` WHERE (`sub2`.`Language` <> 0) AND (`sub2`.`entry` = `items`.`entry`) AND (`sub2`.`Complete` = 0) AND (`VersionEnd` = '.$BuildNumber_max.')) AND (`items`.`VersionEnd` = '.$BuildNumber_max.')');
 }
 
@@ -118 +118 @@
   echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
         <a title="Přeložené questy přilášeného uživatele" href="?group='.$GroupId.'&amp;action=my">Moje překlady</a><br /><br />');
-  WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = '.$Table.'.`user`) AS `UserName` FROM `'.$Table.'` Where `user` = '.$_SESSION['UserID']);
+  WriteQuests('SELECT `'.$Table.'`.*, `user`.`user` AS `UserName` FROM `'.$Table.'` JOIN `user` ON `user`.`id` = `'.$Table.'`.`user` WHERE `'.$Table.'`.`user` = '.$_SESSION['UserID']);
 }
 
@@ -231 +231 @@
         '<strong>Vypis překladů uživatele '.$Line[0].': </strong><br /><br />');
       if(array_key_exists('not', $_GET)) 
-        WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` Where `Complete` = 0 AND `user` = '.$_GET['user']);
-      else WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` Where `user` = '.$_GET['user']);
+        WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE (`Complete` = 0) AND (`user` = '.$_GET['user'].')');
+      else WriteQuests('SELECT *, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `'.$Table.'`.`user`) AS `UserName` FROM `'.$Table.'` WHERE `user` = '.$_GET['user']);
     } else echo('Nebyl nalezen uživatel se zadaným id');
   } else echo('Je nutno zadat id uživatele.');

trunk/team.php

@@ -188 +188 @@
 function TeamShow()
 {
-  global $Database;
+  global $Database, $TranslationTree;
   
   if(array_key_exists('id', $_GET))
@@ -212 +212 @@
     echo('<strong>Překladatelský tým '.$Team['Name'].'</strong><br />'.
       'Webové stránky: <a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a><br/>'.
-      'Vedoucí: '.$Leader.'<br/>'.
-    $Team['Description'].'<br /><br />'.
-      '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ');
+      'Vedoucí: <strong>'.$Leader.'</strong><br/>'.
+    $Team['Description'].'<br /><br />');
+    //echo('<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ');
     if(Licence(LICENCE_USER)) echo('<a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit do týmu</a><br /><br />');
     echo('<fieldset><legend>Statistika</legend>'.