Changeset 238

Timestamp:

Jul 3, 2009, 9:35:30 AM (15 years ago)

Author:

maron

Message:

Možnost porovnávat všechny verze, zobrazení verze v porovnávání

Location:

trunk

Files:

• comparison.php (modified) (1 diff)
• form.php (modified) (1 diff)
• includes/global_function.php (modified) (1 diff)

trunk/comparison.php

@@ -96 +96 @@
   }
   echo('</tr>');
+  echo('<tr><th>Verze</th>');
+  foreach($Line as $Index => $LineItem)
+  {
+        echo('<td>');
+        echo (GetVersionWOW($LineItem['VersionStart']).' - '.GetVersionWOW($LineItem['VersionEnd']));
+        echo('</td>');
+  }
+  echo('</tr>');
   foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
   {          

trunk/form.php

@@ -55 +55 @@
         <option value="-1">Vyberte text k porovnání</option>
         <option value="-1">Zobrazit/porovnat všechny</option>'); 
-         $DataID = $Database->SQLCommand('SELECT *, (SELECT user.user FROM user WHERE user.id = '.$Table.'.user) as User  FROM '.$Table.' WHERE (entry = '.$Line['entry'].') AND (Language <> 0) AND (ID <> '.$Line['ID'].')');  
+         $DataID = $Database->SQLCommand('SELECT *, (SELECT user.user FROM user WHERE user.id = '.$Table.'.user) as User  FROM '.$Table.' WHERE (entry = '.$Line['entry'].') AND (ID <> '.$Line['ID'].')');  
          while($version = mysql_fetch_array($DataID))
          {     
                 if ($version['ID'] == $Line['Take']) echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].' (převzato)</option>');   
-        else echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].'</option>');
+        else {
+                  if (0 == $version['Language']) $version['User'] = 'Předloha';
+                  echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].' ('.GetVersionWOW($Line['VersionStart']).' - '.GetVersionWOW($Line['VersionEnd']).')</option>');
+                }
      }
      echo('</select></form>');          

trunk/includes/global_function.php

@@ -276 +276 @@
     if(($old <> $new) and ($GroupItem['Column'] <> 'Comment')) 
     {
-      //  echo $old.'X'.$new;
+        echo $old.'X'.$new;
       $result = false;
     }