[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 1.02_01
Kevin Falcone
falcone at bestpractical.com
Fri Jan 30 16:38:21 EST 2015
The branch, master has been updated
via 371b24e5eda213b8c8c4fb0442a5d02ad29e2e5d (commit)
via 0c5cbfb3d0459dcdbc6ecbb5c65967895602f49c (commit)
via bc639a44a109cb67ce05cbbaf212837cc05e1a73 (commit)
from d96a2afe69e592abd60f04ed8fd641f20853e52b (commit)
Summary of changes:
Changes | 3 +++
MANIFEST | 1 +
META.yml | 6 +++---
.../User/Elements/AssetList/ModifyAssetSearch | 19 +++++++++++++++++++
inc/Module/Install.pm | 6 +++++-
inc/Module/Install/Base.pm | 2 +-
inc/Module/Install/Can.pm | 2 +-
inc/Module/Install/Fetch.pm | 2 +-
inc/Module/Install/Include.pm | 2 +-
inc/Module/Install/Makefile.pm | 2 +-
inc/Module/Install/Metadata.pm | 2 +-
inc/Module/Install/RTx.pm | 4 ++--
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/RT/Extension/MergeUsers.pm | 2 +-
15 files changed, 42 insertions(+), 15 deletions(-)
create mode 100644 html/Callbacks/RT-Extension-MergeUsers/User/Elements/AssetList/ModifyAssetSearch
- Log -----------------------------------------------------------------
commit bc639a44a109cb67ce05cbbaf212837cc05e1a73
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Jan 30 16:20:31 2015 -0500
Upgrade Module::Install
diff --git a/META.yml b/META.yml
index 79eb10b..57ab446 100644
--- a/META.yml
+++ b/META.yml
@@ -8,7 +8,7 @@ configure_requires:
ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.12'
+generated_by: 'Module::Install version 1.14'
license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -29,5 +29,5 @@ resources:
license: http://opensource.org/licenses/gpl-license.php
repository: https://github.com/bestpractical/rt-extension-mergeusers
version: '1.02'
-x_module_install_rtx_version: '0.36'
+x_module_install_rtx_version: '0.37'
x_requires_rt: 4.0.0
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 5460dd5..ff767fa 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.12';
+ $VERSION = '1.14';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -378,6 +378,7 @@ eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read {
local *FH;
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -386,6 +387,7 @@ END_NEW
sub _read {
local *FH;
open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -416,6 +418,7 @@ eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write {
local *FH;
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
@@ -425,6 +428,7 @@ END_NEW
sub _write {
local *FH;
open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index f9bf5de..4206347 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index b4e5e3b..9929b1b 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -8,7 +8,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index 54f14fb..3d8de76 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index 7224cff..f274f87 100644
--- a/inc/Module/Install/Include.pm
+++ b/inc/Module/Install/Include.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 81cddd5..66993af 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 2c66b1e..e547fa0 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 73e7245..97acf77 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
use Module::Install::Base;
use base 'Module::Install::Base';
-our $VERSION = '0.36';
+our $VERSION = '0.37';
use FindBin;
use File::Glob ();
@@ -123,7 +123,7 @@ install ::
$has_etc{acl}++;
}
if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
- if ( grep { /\d+\.\d+(\.\d+)?.*$/ } glob('etc/upgrade/*.*') ) {
+ if ( grep { /\d+\.\d+\.\d+.*$/ } glob('etc/upgrade/*.*.*') ) {
$has_etc{upgrade}++;
}
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index e48c32d..9706e5f 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index 409ef40..dbedc00 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
commit 0c5cbfb3d0459dcdbc6ecbb5c65967895602f49c
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Jan 30 16:20:53 2015 -0500
Include MergedUsers in the Asset List search
Otherwise, you'll only find assets associated with the primary user id.
Same problem that TicketList/ModifyWatcherSQL is solving.
diff --git a/MANIFEST b/MANIFEST
index a52ba63..44fabbc 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4,6 +4,7 @@ bin/rt-merge-users.in
bin/rt-update-merged-users.in
Changes
html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
+html/Callbacks/RT-Extension-MergeUsers/User/Elements/AssetList/ModifyAssetSearch
html/Callbacks/RT-Extension-MergeUsers/User/Elements/TicketList/ModifyWatcherSQL
inc/Module/Install.pm
inc/Module/Install/Base.pm
diff --git a/html/Callbacks/RT-Extension-MergeUsers/User/Elements/AssetList/ModifyAssetSearch b/html/Callbacks/RT-Extension-MergeUsers/User/Elements/AssetList/ModifyAssetSearch
new file mode 100644
index 0000000..975872d
--- /dev/null
+++ b/html/Callbacks/RT-Extension-MergeUsers/User/Elements/AssetList/ModifyAssetSearch
@@ -0,0 +1,19 @@
+<%INIT>
+my @ids = @{$User->GetMergedUsers->Content};
+
+for my $role (@Roles) {
+ for my $id (@ids) {
+ $Assets->RoleLimit(
+ TYPE => $role,
+ VALUE => $id,
+ SUBCLAUSE => "Role$role",
+ );
+ }
+}
+
+</%INIT>
+<%ARGS>
+ at Roles => ()
+$User => undef
+$Assets => undef
+</%ARGS>
commit 371b24e5eda213b8c8c4fb0442a5d02ad29e2e5d
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Jan 30 16:24:10 2015 -0500
Bump version for 1.02_01
diff --git a/Changes b/Changes
index 2904236..da18b48 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.02_01 2015-01-30
+ - Compatibility with Assets on UserAssets portlet
+
1.01 2014-12-01
- Fix name of upgrade script in documentation
- Update Module::Install and Module::Install::RTx
diff --git a/META.yml b/META.yml
index 57ab446..2b29940 100644
--- a/META.yml
+++ b/META.yml
@@ -28,6 +28,6 @@ requires:
resources:
license: http://opensource.org/licenses/gpl-license.php
repository: https://github.com/bestpractical/rt-extension-mergeusers
-version: '1.02'
+version: 1.02_01
x_module_install_rtx_version: '0.37'
x_requires_rt: 4.0.0
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 6855638..2ce8a8a 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -55,7 +55,7 @@ use RT::Shredder;
package RT::Extension::MergeUsers;
-our $VERSION = '1.02';
+our $VERSION = '1.02_01';
=head1 NAME
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list