[Rt-commit] rt branch, 4.0-trunk, updated. rt-3.9.7-1126-gba7b2d4
Kevin Falcone
falcone at bestpractical.com
Tue Dec 28 15:58:40 EST 2010
The branch, 4.0-trunk has been updated
via ba7b2d4b4420d576d3a3ba1ab39fe6b960be3b40 (commit)
via e697e268b084affe59c99f6e3f60d9de091bcd93 (commit)
via 816d9e57cdd473d80b344a877d2a4195156624ff (commit)
via 51132971e7ed3f9aac1051471e667d2c46b7859d (commit)
via 77209c3fde59313d6b089ceeb860fdf411fba8bb (commit)
via 37b0b19371ec785cd772b21b1bc72e9c4d79c8df (commit)
via 6134b351eb410c5a36ca7a55c20cd29afbfe3a33 (commit)
via a2693b0112098cbf1d6f53ef67e3c45bbc16f8a6 (commit)
via 1c00409b77c049217820c6827864aa2a9ab9b06e (commit)
via b94d8b727caf31c6b31c35652a4465086560e209 (commit)
via ffce595ffb2bdfe603c71887e9bba2486cf84543 (commit)
via 3ad9ff384197ab2b40190e32f467cd907d0c2dae (commit)
via 3cf134e8ed7177dfdf8648ff9fa6a5204243f114 (commit)
via 276138214cd3700560bf628a501338cc47439176 (commit)
via bc56f5bf5534db3a90b6c3e9bbb021d979500149 (commit)
via 78b2af5e3c3bfa25c2b619157680c6b0d458c7d1 (commit)
via 5559bea49258d6e08006bf7f4ac0b08feca0502b (commit)
via f23e5027a92f86ec21c98e3cfe78cbba0e18e569 (commit)
via faa35e65bc7497d2bdea76e927f6ae3d0d8936dc (commit)
via 27b08989fd0c14d1aa30087a88487fa2668522d9 (commit)
via e1f84c11b62028e64184c6ea2964c12ef8ed8a97 (commit)
via 9f3478d9fe8010a968c96ee66e83f0e1ec31c909 (commit)
via a5b5899b4e3ea580821f0a8916ead6033a7fc141 (commit)
via 375fd64719ef8c0f4e9a72b94ba44c5aac7b745c (commit)
from e679291b1d40c3d35651447c1fa75588d46d062d (commit)
Summary of changes:
.gitignore | 1 +
UPGRADING | 27 +++
UPGRADING.rtfm | 97 ----------
configure.ac | 1 +
etc/rtfm/upgrade/2.1.0/acl.Oracle | 4 -
etc/rtfm/upgrade/2.1.0/acl.Pg | 24 ---
etc/rtfm/upgrade/2.1.0/acl.mysql | 4 -
etc/rtfm/upgrade/2.1.0/content | 2 -
etc/rtfm/upgrade/2.1.0/schema.Oracle | 22 ---
etc/rtfm/upgrade/2.1.0/schema.Pg | 20 --
etc/rtfm/upgrade/2.1.0/schema.mysql | 20 --
etc/rtfm/upgrade/2.1.30/acl.Oracle | 4 -
etc/rtfm/upgrade/2.1.30/acl.Pg | 4 -
etc/rtfm/upgrade/2.1.30/acl.mysql | 4 -
etc/rtfm/upgrade/2.1.30/content | 2 -
etc/rtfm/upgrade/2.1.30/schema.Oracle | 7 -
etc/rtfm/upgrade/2.2.0RC2/acl.Oracle | 4 -
etc/rtfm/upgrade/2.2.0RC2/acl.Pg | 4 -
etc/rtfm/upgrade/2.2.0RC2/acl.mysql | 4 -
etc/rtfm/upgrade/2.2.0RC2/content | 2 -
etc/rtfm/upgrade/2.2.0RC2/schema.Oracle | 1 -
etc/rtfm/upgrade/2.2.0RC2/schema.Pg | 4 -
etc/rtfm/upgrade/2.2.0RC2/schema.mysql | 1 -
etc/rtfm/upgrade/migrate-2.0-to-2.1 | 292 ------------------------------
etc/rtfm/upgrade/upgrade-mysql-schema.pl | 248 -------------------------
etc/upgrade/3.9.8/content | 22 +++
etc/upgrade/upgrade-articles.in | 258 ++++++++++++++++++++++++++
etc/upgrade/upgrade-mysql-schema.pl | 25 +++-
lib/RT/Links.pm | 2 +-
29 files changed, 334 insertions(+), 776 deletions(-)
delete mode 100644 UPGRADING.rtfm
delete mode 100644 etc/rtfm/upgrade/2.1.0/acl.Oracle
delete mode 100644 etc/rtfm/upgrade/2.1.0/acl.Pg
delete mode 100644 etc/rtfm/upgrade/2.1.0/acl.mysql
delete mode 100644 etc/rtfm/upgrade/2.1.0/content
delete mode 100644 etc/rtfm/upgrade/2.1.0/schema.Oracle
delete mode 100644 etc/rtfm/upgrade/2.1.0/schema.Pg
delete mode 100644 etc/rtfm/upgrade/2.1.0/schema.mysql
delete mode 100644 etc/rtfm/upgrade/2.1.30/acl.Oracle
delete mode 100644 etc/rtfm/upgrade/2.1.30/acl.Pg
delete mode 100644 etc/rtfm/upgrade/2.1.30/acl.mysql
delete mode 100644 etc/rtfm/upgrade/2.1.30/content
delete mode 100644 etc/rtfm/upgrade/2.1.30/schema.Oracle
delete mode 100644 etc/rtfm/upgrade/2.1.30/schema.Pg
delete mode 100644 etc/rtfm/upgrade/2.1.30/schema.mysql
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/acl.Oracle
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/acl.Pg
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/acl.mysql
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/content
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/schema.Oracle
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/schema.Pg
delete mode 100644 etc/rtfm/upgrade/2.2.0RC2/schema.mysql
delete mode 100644 etc/rtfm/upgrade/migrate-2.0-to-2.1
delete mode 100755 etc/rtfm/upgrade/upgrade-mysql-schema.pl
create mode 100644 etc/upgrade/3.9.8/content
create mode 100644 etc/upgrade/upgrade-articles.in
- Log -----------------------------------------------------------------
commit ba7b2d4b4420d576d3a3ba1ab39fe6b960be3b40
Merge: e679291 e697e26
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Tue Dec 28 15:35:53 2010 -0500
Merge branch 'articles-upgrade' into 4.0-trunk
Conflicts:
lib/RT/Links_Overlay.pm
Re-apply parentheses error fixed in Links_Overlay in the branch
diff --cc configure.ac
index e31e52b,3d7de2c..12efb1a
--- a/configure.ac
+++ b/configure.ac
@@@ -392,9 -387,10 +392,10 @@@ AC_CONFIG_FILES(
etc/upgrade/3.8-ical-extension
etc/upgrade/split-out-cf-categories
etc/upgrade/generate-rtaddressregexp
+ etc/upgrade/upgrade-articles
sbin/rt-attributes-viewer
sbin/rt-session-viewer
- sbin/rt-dump-database
+ sbin/rt-dump-metadata
sbin/rt-setup-database
sbin/rt-test-dependencies
sbin/rt-email-digest
diff --cc lib/RT/Links.pm
index d4e7032,25f0d1a..db23d98
mode 100644,100755..100644
--- a/lib/RT/Links.pm
+++ b/lib/RT/Links.pm
@@@ -75,76 -76,14 +75,76 @@@ use RT::Link
use base 'RT::SearchBuilder';
+sub Table { 'Links'}
+
-sub _Init {
+use RT::URI;
+
+sub Limit {
my $self = shift;
- $self->{'table'} = 'Links';
- $self->{'primary_key'} = 'id';
+ my %args = ( ENTRYAGGREGATOR => 'AND',
+ OPERATOR => '=',
+ @_);
+
+ #if someone's trying to search for tickets, try to resolve the uris for searching.
+
+ if ( ( $args{'OPERATOR'} eq '=') and
- ( $args{'FIELD'} eq 'Base') or ($args{'FIELD'} eq 'Target')
++ ( ( $args{'FIELD'} eq 'Base') or ($args{'FIELD'} eq 'Target') )
+ ) {
+ my $dummy = RT::URI->new($self->CurrentUser);
+ $dummy->FromURI($args{'VALUE'});
+ # $uri = $dummy->URI;
+ }
+
+
+ # If we're limiting by target, order by base
+ # (Order by the thing that's changing)
+
+ if ( ($args{'FIELD'} eq 'Target') or
+ ($args{'FIELD'} eq 'LocalTarget') ) {
+ $self->OrderBy (ALIAS => 'main',
+ FIELD => 'Base',
+ ORDER => 'ASC');
+ }
+ elsif ( ($args{'FIELD'} eq 'Base') or
+ ($args{'FIELD'} eq 'LocalBase') ) {
+ $self->OrderBy (ALIAS => 'main',
+ FIELD => 'Target',
+ ORDER => 'ASC');
+ }
+
+
+ $self->SUPER::Limit(%args);
+}
- return ( $self->SUPER::_Init(@_) );
+=head2 LimitRefersTo URI
+
+find all things that refer to URI
+
+=cut
+
+sub LimitRefersTo {
+ my $self = shift;
+ my $URI = shift;
+
+ $self->Limit(FIELD => 'Type', VALUE => 'RefersTo');
+ $self->Limit(FIELD => 'Target', VALUE => $URI);
+}
+
+
+=head2 LimitReferredToBy URI
+
+find all things that URI refers to
+
+=cut
+
+sub LimitReferredToBy {
+ my $self = shift;
+ my $URI = shift;
+
+ $self->Limit(FIELD => 'Type', VALUE => 'RefersTo');
+ $self->Limit(FIELD => 'Base', VALUE => $URI);
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list