Ticket #129: rejected.patch

gp-includes/things/translation.php

@@ -79 +79 @@
                 if ( 'yes' == gp_array_get( $filters, 'translated' ) ) {
                         $where[] = 't.translation_0 IS NOT NULL';
                 } elseif ( 'no' == gp_array_get( $filters, 'translated' ) ) {
-                        $where[] = 't.translation_0 IS NULL';
+                        // rejected are untranslated too
+                        $where[] = "(t.translation_0 IS NULL OR t.status = 'rejected')";
                 }
                 if ( gp_array_get( $filters, 'before_date_added' ) ) {
                         $where[] = $gpdb->prepare( 't.date_added > %s', gp_array_get( $filters, 'before_date_added' ) );
@@ -192 +193 @@
                                 array('original_id' => $this->original_id, 'translation_set_id' => $this->translation_set_id, 'status' => 'waiting') )
             && $this->update( array('status' => 'old'),
                         array('original_id' => $this->original_id, 'translation_set_id' => $this->translation_set_id, 'status' => 'fuzzy') )
-                && $this->update( array('status' => 'current') );
+                && $this->update( array('status' => 'old'),
+                        array('original_id' => $this->original_id, 'translation_set_id' => $this->translation_set_id, 'status' => 'rejected') )
+                && $this->update( array('status' => 'current') );               
         }
         
         function reject() {