Merge pull request #1469 from gluneau/conflicts-unresolved-Fieldname-…

…table-not-in-join should be conflicts_resolved not conflicts_unresolved table
aces · Jan 5, 2016 · ff53b32 · ff53b32
2 parents f311fcc + d5f6734
commit ff53b32
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc b/modules/conflict_resolver/php/NDB_Menu_Filter_resolved_conflicts.class.inc
@@ -100,7 +100,7 @@ class NDB_Menu_Filter_Resolved_Conflicts extends NDB_Menu_Filter
             array(
              'candidate.PSCID',
              'session.CandID',
-             'conflicts_unresolved.Fieldname',
+             'conflicts_resolved.Fieldname',
             )
         );
 
@@ -138,7 +138,7 @@ class NDB_Menu_Filter_Resolved_Conflicts extends NDB_Menu_Filter
             array(
              'CandID'   => 'session.CandID',
              'PSCID'    => 'candidate.PSCID',
-             'Question' => 'conflicts_unresolved.Fieldname',
+             'Question' => 'conflicts_resolved.Fieldname',
             )
         );
         return true;