Changeset 656

Timestamp:

Dec 16, 2013, 2:14:02 PM (11 years ago)

Author:

maron

Message:

• Added: New filter Notcomplete-nottran
• Fixed: Column Take should index always to text with right versionstart and versionend, for importing

Location:

trunk

Files:

• Modules/Translation/Save.php (modified) (1 diff)
• Modules/Translation/TranslationList.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Save.php

@@ -112 +112 @@
                                                         $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
                                                         $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
-                                                          $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$SourceText['ID'].', NOW()';
+                                                          $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$EnglishFound['ID'].', NOW()';
         
                                                         $CompleteParts = 0;

trunk/Modules/Translation/TranslationList.php

@@ -38 +38 @@
                 else $Selected = '';
                 $Output .= '<option value="4"'.$Selected.'>Anglické</option>';
+                if($Filter['State'] == 5) $Selected = ' selected="selected"';
+                else $Selected = '';
+                $Output .= '<option value="5"'.$Selected.'>Rozpracované-Nepřeložené</option>';
                 $Output .= '</select></td>';
         
@@ -162 +165 @@
                         ') AND (`T`.`Complete` = 0)';
                         else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
+                        else if($Filter['State'] == 5) $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
+                        ') AND (`T`.`Complete` = 0)'.
+      'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilter.
+                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
+                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
                 }
         

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 655; // Subversion revision
+$Revision = 656; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
 $ReleaseTime = '2013-12-16';