[Rt-commit] rt branch, 4.2/fix-organization-for-all-links, repushed

[Jim Brandt]

The branch 4.2/fix-organization-for-all-links was deleted and repushed:
       was 83341f3662421d4f3058aff7556f3ea69268050a
       now fc363d25eae8e7f05257a5d4d3c3dd263f642617

-:  ------- > 1:  fb647e0 Update tests to reflect API consistent with ticket links
-:  ------- > 2:  6d5a075 Update article URI API to be consistent with ticket URI API
-:  ------- > 3:  d4a4317 Warn if we parse an id but can't load the article
-:  ------- > 4:  71ab3bf Move article object validation to cover entire method
1:  068cf0c ! 5:  92c6e25 Validate article and other types of links
    @@ -56,6 +56,15 @@
          my $prefix = $rt_uri->LocalURIPrefix;
      
     @@
    + 
    +             my $tprefix = $prefix .'/'. ($tclass eq 'RT::Ticket'? 'ticket' : $tclass) .'/';
    + 
    ++            $tprefix = $prefix . '/article/' if $tclass eq 'RT::Article';
    ++
    +             my $query = "SELECT s.id FROM $stable s LEFT JOIN $ttable t "
    +                 ." ON t.id = ". sql_str2int("SUBSTR(s.$scolumn, ?)")
    +                 ." WHERE s.$scolumn LIKE ? AND t.id IS NULL";
    +@@
                  }
              }
          }
2:  83341f3 ! 6:  747a135 Add indent for new foreach loops
    @@ -120,6 +120,9 @@
     -            my $tprefix = $prefix .'/'. ($tclass eq 'RT::Ticket'? 'ticket' : $tclass) .'/';
     +                my $tprefix = $prefix .'/'. ($tclass eq 'RT::Ticket'? 'ticket' : $tclass) .'/';
      
    +-            $tprefix = $prefix . '/article/' if $tclass eq 'RT::Article';
    ++                $tprefix = $prefix . '/article/' if $tclass eq 'RT::Article';
    + 
     -            my $query = "SELECT s.id FROM $stable s LEFT JOIN $ttable t "
     -                ." ON t.id = ". sql_str2int("SUBSTR(s.$scolumn, ?)")
     -                ." WHERE s.$scolumn LIKE ? AND t.id IS NULL";
    @@ -173,3 +176,4 @@
          } # end foreach my $package (@rt_uris)
          return $res;
      };
    +
-:  ------- > 7:  fc363d2 Fix indent. Whitespace-only change