[Bps-public-commit] rt-shipwright branch, master, updated. 00c7e1c018231c0b45f67666bd9db9416ad2b657
? sunnavy
sunnavy at bestpractical.com
Fri Dec 10 01:11:51 EST 2010
The branch, master has been updated
via 00c7e1c018231c0b45f67666bd9db9416ad2b657 (commit)
from 103c336651e7b41ac6ce25749caa3a2e9d096969 (commit)
Summary of changes:
rt4/shipwright/version.yml | 2 +-
rt4/sources/RT/vendor/.tag | 2 +-
rt4/sources/RT/vendor/Makefile | 2 +-
rt4/sources/RT/vendor/autom4te.cache/output.0 | 20 ++++++++--------
rt4/sources/RT/vendor/autom4te.cache/traces.0 | 4 +-
rt4/sources/RT/vendor/config.log | 22 +++++++++---------
rt4/sources/RT/vendor/config.status | 16 ++++++------
rt4/sources/RT/vendor/configure | 20 ++++++++--------
rt4/sources/RT/vendor/lib/RT/ACL_Overlay.pm | 3 ++
rt4/sources/RT/vendor/lib/RT/Generated.pm | 2 +-
rt4/sources/RT/vendor/lib/RT/SavedSearch.pm | 24 ++++++++++++++++++++
rt4/sources/RT/vendor/lib/RT/Tickets_Overlay.pm | 14 +++++-----
rt4/sources/RT/vendor/sbin/rt-server | 1 +
rt4/sources/RT/vendor/sbin/rt-server.fcgi | 1 +
rt4/sources/RT/vendor/sbin/rt-server.in | 1 +
rt4/sources/RT/vendor/sbin/standalone_httpd | 1 +
.../RT/vendor/share/html/Admin/Users/MyRT.html | 2 +-
.../RT/vendor/share/html/Dashboards/Queries.html | 2 +-
.../RT/vendor/share/html/Elements/SavedSearches | 2 +-
rt4/sources/RT/vendor/share/html/Prefs/MyRT.html | 2 +-
.../RT/vendor/share/html/Widgets/SavedSearch | 8 +++---
rt4/sources/RT/vendor/share/html/m/_elements/menu | 2 +-
rt4/sources/RT/vendor/share/html/m/ticket/reply | 2 +-
23 files changed, 93 insertions(+), 62 deletions(-)
- Log -----------------------------------------------------------------
commit 00c7e1c018231c0b45f67666bd9db9416ad2b657
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Dec 10 14:11:22 2010 +0800
update to 27596f6eb412b
diff --git a/rt4/shipwright/version.yml b/rt4/shipwright/version.yml
index 7924bda..738313e 100644
--- a/rt4/shipwright/version.yml
+++ b/rt4/shipwright/version.yml
@@ -1,6 +1,6 @@
---
RT:
- vendor: 3.9.7-787-g2df546b
+ vendor: 3.9.7-791-g27596f6
cpan-Any-Moose:
vendor: 0.13
cpan-Apache-Session:
diff --git a/rt4/sources/RT/vendor/.tag b/rt4/sources/RT/vendor/.tag
index 47122b9..7b5d641 100644
--- a/rt4/sources/RT/vendor/.tag
+++ b/rt4/sources/RT/vendor/.tag
@@ -1 +1 @@
-rt-3.9.7-787-g2df546b
+rt-3.9.7-791-g27596f6
diff --git a/rt4/sources/RT/vendor/Makefile b/rt4/sources/RT/vendor/Makefile
index 5e6dc6c..6a48134 100644
--- a/rt4/sources/RT/vendor/Makefile
+++ b/rt4/sources/RT/vendor/Makefile
@@ -63,7 +63,7 @@ SITE_CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_SiteConfig.pm
RT_VERSION_MAJOR = 3
RT_VERSION_MINOR = 9
-RT_VERSION_PATCH = 7-787-g2df546b
+RT_VERSION_PATCH = 7-791-g27596f6
RT_VERSION = $(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
TAG = rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
diff --git a/rt4/sources/RT/vendor/autom4te.cache/output.0 b/rt4/sources/RT/vendor/autom4te.cache/output.0
index 5c58568..071f216 100644
--- a/rt4/sources/RT/vendor/autom4te.cache/output.0
+++ b/rt4/sources/RT/vendor/autom4te.cache/output.0
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac Revision.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for RT rt-3.9.7-787-g2df546b.
+@%:@ Generated by GNU Autoconf 2.67 for RT rt-3.9.7-791-g27596f6.
@%:@
@%:@ Report bugs to <rt-bugs at bestpractical.com>.
@%:@
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='RT'
PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='rt-3.9.7-787-g2df546b'
-PACKAGE_STRING='RT rt-3.9.7-787-g2df546b'
+PACKAGE_VERSION='rt-3.9.7-791-g27596f6'
+PACKAGE_STRING='RT rt-3.9.7-791-g27596f6'
PACKAGE_BUGREPORT='rt-bugs at bestpractical.com'
PACKAGE_URL=''
@@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures RT rt-3.9.7-787-g2df546b to adapt to many kinds of systems.
+\`configure' configures RT rt-3.9.7-791-g27596f6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1361,7 +1361,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of RT rt-3.9.7-787-g2df546b:";;
+ short | recursive ) echo "Configuration of RT rt-3.9.7-791-g27596f6:";;
esac
cat <<\_ACEOF
@@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-RT configure rt-3.9.7-787-g2df546b
+RT configure rt-3.9.7-791-g27596f6
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1585,7 +1585,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by RT $as_me rt-3.9.7-787-g2df546b, which was
+It was created by RT $as_me rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -1939,7 +1939,7 @@ rt_version_major=3
rt_version_minor=9
-rt_version_patch=7-787-g2df546b
+rt_version_patch=7-791-g27596f6
test "x$rt_version_major" = 'x' && rt_version_major=0
test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -4465,7 +4465,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by RT $as_me rt-3.9.7-787-g2df546b, which was
+This file was extended by RT $as_me rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4518,7 +4518,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-RT config.status rt-3.9.7-787-g2df546b
+RT config.status rt-3.9.7-791-g27596f6
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/rt4/sources/RT/vendor/autom4te.cache/traces.0 b/rt4/sources/RT/vendor/autom4te.cache/traces.0
index d10377d..461056f 100644
--- a/rt4/sources/RT/vendor/autom4te.cache/traces.0
+++ b/rt4/sources/RT/vendor/autom4te.cache/traces.0
@@ -1,4 +1,4 @@
-m4trace:configure.ac:10: -1- AC_INIT([RT], [rt-3.9.7-787-g2df546b], [rt-bugs at bestpractical.com])
+m4trace:configure.ac:10: -1- AC_INIT([RT], [rt-3.9.7-791-g27596f6], [rt-bugs at bestpractical.com])
m4trace:configure.ac:10: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:10: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:10: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -152,7 +152,7 @@ m4trace:configure.ac:14: -1- m4_pattern_allow([^rt_version_major$])
m4trace:configure.ac:16: -1- AC_SUBST([rt_version_minor], [9])
m4trace:configure.ac:16: -1- AC_SUBST_TRACE([rt_version_minor])
m4trace:configure.ac:16: -1- m4_pattern_allow([^rt_version_minor$])
-m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [7-787-g2df546b])
+m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [7-791-g27596f6])
m4trace:configure.ac:18: -1- AC_SUBST_TRACE([rt_version_patch])
m4trace:configure.ac:18: -1- m4_pattern_allow([^rt_version_patch$])
m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh])
diff --git a/rt4/sources/RT/vendor/config.log b/rt4/sources/RT/vendor/config.log
index 04218c5..1175f7b 100644
--- a/rt4/sources/RT/vendor/config.log
+++ b/rt4/sources/RT/vendor/config.log
@@ -1,7 +1,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by RT configure rt-3.9.7-787-g2df546b, which was
+It was created by RT configure rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ ./configure --with-db-type=SQLite --enable-layout=relative --with-web-handler=standalone ./configure
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.67. Invocation command line was
hostname = i5
uname -m = x86_64
-uname -r = 2.6.35-23-generic
+uname -r = 2.6.35-24-generic
uname -s = Linux
-uname -v = #41-Ubuntu SMP Wed Nov 24 11:55:36 UTC 2010
+uname -v = #42-Ubuntu SMP Thu Dec 2 02:41:37 UTC 2010
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -158,7 +158,7 @@ configure:4065: creating ./config.status
## Running config.status. ##
## ---------------------- ##
-This file was extended by RT config.status rt-3.9.7-787-g2df546b, which was
+This file was extended by RT config.status rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES =
@@ -253,7 +253,7 @@ DB_RT_HOST='localhost'
DB_RT_PASS='rt_pass'
DB_RT_USER='rt_user'
DB_TYPE='SQLite'
-DEFS='-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"rt-3.9.7-787-g2df546b\" -DPACKAGE_STRING=\"RT\ rt-3.9.7-787-g2df546b\" -DPACKAGE_BUGREPORT=\"rt-bugs at bestpractical.com\" -DPACKAGE_URL=\"\"'
+DEFS='-DPACKAGE_NAME=\"RT\" -DPACKAGE_TARNAME=\"rt\" -DPACKAGE_VERSION=\"rt-3.9.7-791-g27596f6\" -DPACKAGE_STRING=\"RT\ rt-3.9.7-791-g27596f6\" -DPACKAGE_BUGREPORT=\"rt-bugs at bestpractical.com\" -DPACKAGE_URL=\"\"'
ECHO_C=''
ECHO_N='-n'
ECHO_T=''
@@ -286,10 +286,10 @@ MASON_SESSION_PATH_R='/opt/rt4/var/session_data'
OBJEXT='o'
PACKAGE_BUGREPORT='rt-bugs at bestpractical.com'
PACKAGE_NAME='RT'
-PACKAGE_STRING='RT rt-3.9.7-787-g2df546b'
+PACKAGE_STRING='RT rt-3.9.7-791-g27596f6'
PACKAGE_TARNAME='rt'
PACKAGE_URL=''
-PACKAGE_VERSION='rt-3.9.7-787-g2df546b'
+PACKAGE_VERSION='rt-3.9.7-791-g27596f6'
PATH_SEPARATOR=':'
PERL='/usr/bin/perl'
RTGROUP='www-data'
@@ -325,7 +325,7 @@ RT_VAR_PATH='var'
RT_VAR_PATH_R='/opt/rt4/var'
RT_VERSION_MAJOR='3'
RT_VERSION_MINOR='9'
-RT_VERSION_PATCH='7-787-g2df546b'
+RT_VERSION_PATCH='7-791-g27596f6'
SHELL='/bin/bash'
WEB_GROUP='www-data'
WEB_HANDLER='standalone'
@@ -390,7 +390,7 @@ psdir='${docdir}'
rt_layout_name='relative'
rt_version_major='3'
rt_version_minor='9'
-rt_version_patch='7-787-g2df546b'
+rt_version_patch='7-791-g27596f6'
sbindir='sbin'
sessionstatedir='var/session_data'
sharedstatedir='${prefix}/com'
@@ -404,8 +404,8 @@ target_alias='./configure'
/* confdefs.h */
#define PACKAGE_NAME "RT"
#define PACKAGE_TARNAME "rt"
-#define PACKAGE_VERSION "rt-3.9.7-787-g2df546b"
-#define PACKAGE_STRING "RT rt-3.9.7-787-g2df546b"
+#define PACKAGE_VERSION "rt-3.9.7-791-g27596f6"
+#define PACKAGE_STRING "RT rt-3.9.7-791-g27596f6"
#define PACKAGE_BUGREPORT "rt-bugs at bestpractical.com"
#define PACKAGE_URL ""
diff --git a/rt4/sources/RT/vendor/config.status b/rt4/sources/RT/vendor/config.status
index 2f86bc2..fce47d6 100755
--- a/rt4/sources/RT/vendor/config.status
+++ b/rt4/sources/RT/vendor/config.status
@@ -391,7 +391,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by RT $as_me rt-3.9.7-787-g2df546b, which was
+This file was extended by RT $as_me rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -430,7 +430,7 @@ Report bugs to <rt-bugs at bestpractical.com>."
ac_cs_config="'--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' './configure' 'build_alias=./configure' 'host_alias=./configure' 'target_alias=./configure' 'PERL=/usr/bin/perl'"
ac_cs_version="\
-RT config.status rt-3.9.7-787-g2df546b
+RT config.status rt-3.9.7-791-g27596f6
configured by ./configure, generated by GNU Autoconf 2.67,
with options \"$ac_cs_config\"
@@ -438,7 +438,7 @@ Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/opt/bps/git/rt39/rt-3.9.7-787-g2df546b'
+ac_pwd='/opt/bps/git/rt39/rt-3.9.7-791-g27596f6'
srcdir='.'
INSTALL='install-sh'
AWK='mawk'
@@ -665,7 +665,7 @@ S["RT_LIB_PATH"]="lib"
S["RT_LOCAL_PATH"]="local"
S["RT_DOC_PATH"]="share/doc"
S["RT_PATH"]="/opt/rt4"
-S["RT_VERSION_PATCH"]="7-787-g2df546b"
+S["RT_VERSION_PATCH"]="7-791-g27596f6"
S["RT_VERSION_MINOR"]="9"
S["RT_VERSION_MAJOR"]="3"
S["RT_GPG"]="1"
@@ -739,7 +739,7 @@ S["AWK"]="mawk"
S["INSTALL_DATA"]="${INSTALL} -m 644"
S["INSTALL_SCRIPT"]="${INSTALL}"
S["INSTALL_PROGRAM"]="${INSTALL}"
-S["rt_version_patch"]="7-787-g2df546b"
+S["rt_version_patch"]="7-791-g27596f6"
S["rt_version_minor"]="9"
S["rt_version_major"]="3"
S["target_alias"]="./configure"
@@ -749,7 +749,7 @@ S["LIBS"]=""
S["ECHO_T"]=""
S["ECHO_N"]="-n"
S["ECHO_C"]=""
-S["DEFS"]="-DPACKAGE_NAME=\\\"RT\\\" -DPACKAGE_TARNAME=\\\"rt\\\" -DPACKAGE_VERSION=\\\"rt-3.9.7-787-g2df546b\\\" -DPACKAGE_STRING=\\\"RT\\ rt-3.9.7-787-g2df546b\\\" -DPACKAGE_"\
+S["DEFS"]="-DPACKAGE_NAME=\\\"RT\\\" -DPACKAGE_TARNAME=\\\"rt\\\" -DPACKAGE_VERSION=\\\"rt-3.9.7-791-g27596f6\\\" -DPACKAGE_STRING=\\\"RT\\ rt-3.9.7-791-g27596f6\\\" -DPACKAGE_"\
"BUGREPORT=\\\"rt-bugs at bestpractical.com\\\" -DPACKAGE_URL=\\\"\\\""
S["mandir"]="man"
S["localedir"]="${datarootdir}/locale"
@@ -775,8 +775,8 @@ S["prefix"]="/opt/rt4"
S["exec_prefix"]="/opt/rt4"
S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]="rt-bugs at bestpractical.com"
-S["PACKAGE_STRING"]="RT rt-3.9.7-787-g2df546b"
-S["PACKAGE_VERSION"]="rt-3.9.7-787-g2df546b"
+S["PACKAGE_STRING"]="RT rt-3.9.7-791-g27596f6"
+S["PACKAGE_VERSION"]="rt-3.9.7-791-g27596f6"
S["PACKAGE_TARNAME"]="rt"
S["PACKAGE_NAME"]="RT"
S["PATH_SEPARATOR"]=":"
diff --git a/rt4/sources/RT/vendor/configure b/rt4/sources/RT/vendor/configure
index c946bad..c7cd93f 100755
--- a/rt4/sources/RT/vendor/configure
+++ b/rt4/sources/RT/vendor/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for RT rt-3.9.7-787-g2df546b.
+# Generated by GNU Autoconf 2.67 for RT rt-3.9.7-791-g27596f6.
#
# Report bugs to <rt-bugs at bestpractical.com>.
#
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='RT'
PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='rt-3.9.7-787-g2df546b'
-PACKAGE_STRING='RT rt-3.9.7-787-g2df546b'
+PACKAGE_VERSION='rt-3.9.7-791-g27596f6'
+PACKAGE_STRING='RT rt-3.9.7-791-g27596f6'
PACKAGE_BUGREPORT='rt-bugs at bestpractical.com'
PACKAGE_URL=''
@@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures RT rt-3.9.7-787-g2df546b to adapt to many kinds of systems.
+\`configure' configures RT rt-3.9.7-791-g27596f6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1361,7 +1361,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of RT rt-3.9.7-787-g2df546b:";;
+ short | recursive ) echo "Configuration of RT rt-3.9.7-791-g27596f6:";;
esac
cat <<\_ACEOF
@@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-RT configure rt-3.9.7-787-g2df546b
+RT configure rt-3.9.7-791-g27596f6
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1585,7 +1585,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by RT $as_me rt-3.9.7-787-g2df546b, which was
+It was created by RT $as_me rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -1939,7 +1939,7 @@ rt_version_major=3
rt_version_minor=9
-rt_version_patch=7-787-g2df546b
+rt_version_patch=7-791-g27596f6
test "x$rt_version_major" = 'x' && rt_version_major=0
test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -4465,7 +4465,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by RT $as_me rt-3.9.7-787-g2df546b, which was
+This file was extended by RT $as_me rt-3.9.7-791-g27596f6, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4518,7 +4518,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-RT config.status rt-3.9.7-787-g2df546b
+RT config.status rt-3.9.7-791-g27596f6
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/rt4/sources/RT/vendor/lib/RT/ACL_Overlay.pm b/rt4/sources/RT/vendor/lib/RT/ACL_Overlay.pm
index bfc35f6..c0b1bf4 100755
--- a/rt4/sources/RT/vendor/lib/RT/ACL_Overlay.pm
+++ b/rt4/sources/RT/vendor/lib/RT/ACL_Overlay.pm
@@ -217,6 +217,9 @@ sub Next {
my $self = shift;
my $ACE = $self->SUPER::Next();
+ # Short-circuit having to load up the ->Object
+ return $ACE
+ if $self->CurrentUser->PrincipalObj->Id == RT->SystemUser->Id;
if ( ( defined($ACE) ) and ( ref($ACE) ) ) {
if ( $self->CurrentUser->HasRight( Right => 'ShowACL',
diff --git a/rt4/sources/RT/vendor/lib/RT/Generated.pm b/rt4/sources/RT/vendor/lib/RT/Generated.pm
index be0be0b..72445ba 100644
--- a/rt4/sources/RT/vendor/lib/RT/Generated.pm
+++ b/rt4/sources/RT/vendor/lib/RT/Generated.pm
@@ -2,7 +2,7 @@ package RT;
use warnings;
use strict;
-our $VERSION = '3.9.7-787-g2df546b';
+our $VERSION = '3.9.7-791-g27596f6';
diff --git a/rt4/sources/RT/vendor/lib/RT/SavedSearch.pm b/rt4/sources/RT/vendor/lib/RT/SavedSearch.pm
index cbe6f52..323cd65 100644
--- a/rt4/sources/RT/vendor/lib/RT/SavedSearch.pm
+++ b/rt4/sources/RT/vendor/lib/RT/SavedSearch.pm
@@ -134,16 +134,40 @@ sub Type {
sub _PrivacyObjects {
my $self = shift;
+ my ($has_attr) = @_;
my $CurrentUser = $self->CurrentUser;
my $groups = RT::Groups->new($CurrentUser);
$groups->LimitToUserDefinedGroups;
$groups->WithMember( PrincipalId => $CurrentUser->Id,
Recursively => 1 );
+ if ($has_attr) {
+ my $attrs = $groups->Join(
+ ALIAS1 => 'main',
+ FIELD1 => 'id',
+ TABLE2 => 'Attributes',
+ FIELD2 => 'ObjectId',
+ );
+ $groups->Limit(
+ ALIAS => $attrs,
+ FIELD => 'ObjectType',
+ VALUE => 'RT::Group',
+ );
+ $groups->Limit(
+ ALIAS => $attrs,
+ FIELD => 'Name',
+ VALUE => $has_attr,
+ );
+ }
return ( $CurrentUser->UserObj, @{ $groups->ItemsArrayRef() } );
}
+sub ObjectsForLoading {
+ my $self = shift;
+ return grep { $self->CurrentUserCanSee($_) } $self->_PrivacyObjects( "SavedSearch" );
+}
+
RT::Base->_ImportOverlays();
1;
diff --git a/rt4/sources/RT/vendor/lib/RT/Tickets_Overlay.pm b/rt4/sources/RT/vendor/lib/RT/Tickets_Overlay.pm
index 25af445..b3fc99e 100755
--- a/rt4/sources/RT/vendor/lib/RT/Tickets_Overlay.pm
+++ b/rt4/sources/RT/vendor/lib/RT/Tickets_Overlay.pm
@@ -2908,15 +2908,15 @@ sub _RolesCanSee {
$ACL->Limit( ALIAS => $principal_alias, FIELD => 'Disabled', VALUE => 0 );
my %res = ();
- while ( my $ACE = $ACL->Next ) {
- my $role = $ACE->PrincipalType;
- my $type = $ACE->ObjectType;
+ foreach my $ACE ( @{ $ACL->ItemsArrayRef } ) {
+ my $role = $ACE->__Value('PrincipalType');
+ my $type = $ACE->__Value('ObjectType');
if ( $type eq 'RT::System' ) {
$res{ $role } = 1;
}
elsif ( $type eq 'RT::Queue' ) {
next if $res{ $role } && !ref $res{ $role };
- push @{ $res{ $role } ||= [] }, $ACE->ObjectId;
+ push @{ $res{ $role } ||= [] }, $ACE->__Value('ObjectId');
}
else {
$RT::Logger->error('ShowTicket right is granted on unsupported object');
@@ -2954,8 +2954,8 @@ sub _DirectlyCanSeeIn {
$ACL->Limit( ALIAS => $cgm_alias, FIELD => 'Disabled', VALUE => 0 );
my @res = ();
- while ( my $ACE = $ACL->Next ) {
- my $type = $ACE->ObjectType;
+ foreach my $ACE ( @{ $ACL->ItemsArrayRef } ) {
+ my $type = $ACE->__Value('ObjectType');
if ( $type eq 'RT::System' ) {
# If user is direct member of a group that has the right
# on the system then he can see any ticket
@@ -2963,7 +2963,7 @@ sub _DirectlyCanSeeIn {
return (-1);
}
elsif ( $type eq 'RT::Queue' ) {
- push @res, $ACE->ObjectId;
+ push @res, $ACE->__Value('ObjectId');
}
else {
$RT::Logger->error('ShowTicket right is granted on unsupported object');
diff --git a/rt4/sources/RT/vendor/sbin/rt-server b/rt4/sources/RT/vendor/sbin/rt-server
index 458cf1f..1972d35 100755
--- a/rt4/sources/RT/vendor/sbin/rt-server
+++ b/rt4/sources/RT/vendor/sbin/rt-server
@@ -157,6 +157,7 @@ my $r = Plack::Runner->new( $0 =~ 'standalone' ? ( server => 'Standalone' ) :
env => 'deployment' );
my @args = @ARGV;
push @args, '--port', $port unless grep { m/port/ } @args;
+push @args, '--server', 'Standalone' if RT->InstallMode;
push @args, '--server', 'Starlet' unless $r->{server} || grep { m/server/ } @args;
$r->parse_options(@args);
diff --git a/rt4/sources/RT/vendor/sbin/rt-server.fcgi b/rt4/sources/RT/vendor/sbin/rt-server.fcgi
index 458cf1f..1972d35 100755
--- a/rt4/sources/RT/vendor/sbin/rt-server.fcgi
+++ b/rt4/sources/RT/vendor/sbin/rt-server.fcgi
@@ -157,6 +157,7 @@ my $r = Plack::Runner->new( $0 =~ 'standalone' ? ( server => 'Standalone' ) :
env => 'deployment' );
my @args = @ARGV;
push @args, '--port', $port unless grep { m/port/ } @args;
+push @args, '--server', 'Standalone' if RT->InstallMode;
push @args, '--server', 'Starlet' unless $r->{server} || grep { m/server/ } @args;
$r->parse_options(@args);
diff --git a/rt4/sources/RT/vendor/sbin/rt-server.in b/rt4/sources/RT/vendor/sbin/rt-server.in
index f7df8d5..5ba55db 100755
--- a/rt4/sources/RT/vendor/sbin/rt-server.in
+++ b/rt4/sources/RT/vendor/sbin/rt-server.in
@@ -157,6 +157,7 @@ my $r = Plack::Runner->new( $0 =~ 'standalone' ? ( server => 'Standalone' ) :
env => 'deployment' );
my @args = @ARGV;
push @args, '--port', $port unless grep { m/port/ } @args;
+push @args, '--server', 'Standalone' if RT->InstallMode;
push @args, '--server', 'Starlet' unless $r->{server} || grep { m/server/ } @args;
$r->parse_options(@args);
diff --git a/rt4/sources/RT/vendor/sbin/standalone_httpd b/rt4/sources/RT/vendor/sbin/standalone_httpd
index 458cf1f..1972d35 100755
--- a/rt4/sources/RT/vendor/sbin/standalone_httpd
+++ b/rt4/sources/RT/vendor/sbin/standalone_httpd
@@ -157,6 +157,7 @@ my $r = Plack::Runner->new( $0 =~ 'standalone' ? ( server => 'Standalone' ) :
env => 'deployment' );
my @args = @ARGV;
push @args, '--port', $port unless grep { m/port/ } @args;
+push @args, '--server', 'Standalone' if RT->InstallMode;
push @args, '--server', 'Starlet' unless $r->{server} || grep { m/server/ } @args;
$r->parse_options(@args);
diff --git a/rt4/sources/RT/vendor/share/html/Admin/Users/MyRT.html b/rt4/sources/RT/vendor/share/html/Admin/Users/MyRT.html
index 097e70b..b0d065a 100644
--- a/rt4/sources/RT/vendor/share/html/Admin/Users/MyRT.html
+++ b/rt4/sources/RT/vendor/share/html/Admin/Users/MyRT.html
@@ -88,7 +88,7 @@ push @items, map {["component-$_", $_]} sort keys %allowed_components;
my $sys = RT::System->new( RT::CurrentUser->new($UserObj) );
my @objs = ($sys);
-push @objs, RT::SavedSearch->new( RT::CurrentUser->new( $UserObj ) )->_PrivacyObjects;
+push @objs, RT::SavedSearch->new( RT::CurrentUser->new( $UserObj ) )->ObjectsForLoading;
for my $object (@objs) {
for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
diff --git a/rt4/sources/RT/vendor/share/html/Dashboards/Queries.html b/rt4/sources/RT/vendor/share/html/Dashboards/Queries.html
index 6bf1dd5..57f9fee 100644
--- a/rt4/sources/RT/vendor/share/html/Dashboards/Queries.html
+++ b/rt4/sources/RT/vendor/share/html/Dashboards/Queries.html
@@ -115,7 +115,7 @@ for my $dashboard (@dashboards) {
# add saved searches
my @objs = RT::System->new($session{'CurrentUser'});
-push @objs, RT::SavedSearch->new( $session{CurrentUser} )->_PrivacyObjects
+push @objs, RT::SavedSearch->new( $session{CurrentUser} )->ObjectsForLoading
if $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
Object => $RT::System );
diff --git a/rt4/sources/RT/vendor/share/html/Elements/SavedSearches b/rt4/sources/RT/vendor/share/html/Elements/SavedSearches
index ede9ea0..a547fe3 100644
--- a/rt4/sources/RT/vendor/share/html/Elements/SavedSearches
+++ b/rt4/sources/RT/vendor/share/html/Elements/SavedSearches
@@ -66,7 +66,7 @@
% }
</&>
<%init>
-my @Objects = RT::SavedSearch->new($session{CurrentUser})->_PrivacyObjects;
+my @Objects = RT::SavedSearch->new($session{CurrentUser})->ObjectsForLoading;
push @Objects, RT::System->new( $session{'CurrentUser'} )
if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
Right => 'SuperUser' );
diff --git a/rt4/sources/RT/vendor/share/html/Prefs/MyRT.html b/rt4/sources/RT/vendor/share/html/Prefs/MyRT.html
index 9639c5e..42bc1ea 100644
--- a/rt4/sources/RT/vendor/share/html/Prefs/MyRT.html
+++ b/rt4/sources/RT/vendor/share/html/Prefs/MyRT.html
@@ -115,7 +115,7 @@ my @items = map ["component-$_", $_], grep !$seen{$_}++, @{RT->Config->Get('Home
my $sys = RT::System->new($session{'CurrentUser'});
my @objs = ($sys);
-push @objs, RT::SavedSearch->new( $session{CurrentUser} )->_PrivacyObjects
+push @objs, RT::SavedSearch->new( $session{CurrentUser} )->ObjectsForLoading
if $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
Object => $RT::System );
diff --git a/rt4/sources/RT/vendor/share/html/Widgets/SavedSearch b/rt4/sources/RT/vendor/share/html/Widgets/SavedSearch
index 6080df9..6a2589a 100644
--- a/rt4/sources/RT/vendor/share/html/Widgets/SavedSearch
+++ b/rt4/sources/RT/vendor/share/html/Widgets/SavedSearch
@@ -55,10 +55,6 @@ return \%ARGS;
<%init>
my @actions;
-my @Objects = RT::SavedSearch->new( $session{CurrentUser} )->_PrivacyObjects;
-push @Objects, RT::System->new($session{'CurrentUser'})
- if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
- Right => 'SuperUser' );
$self->{SearchId} ||= $args->{'SavedChartSearchId'} || 'new';
my $SearchParams = { map { $_ => $args->{$_} } @{$self->{SearchFields}} };
@@ -90,6 +86,10 @@ if ( my ( $container_object, $search_id ) = _parse_saved_search(
# look for the current one in the available saved searches
if ($self->{SearchId} eq 'new') {
+ my @Objects = RT::SavedSearch->new( $session{CurrentUser} )->ObjectsForLoading;
+ push @Objects, RT::System->new($session{'CurrentUser'})
+ if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
+ Right => 'SuperUser' );
for my $obj (@Objects) {
for ( $m->comp( "/Search/Elements/SearchesForObject", Object => $obj ) ) {
my ( $desc, $search ) = @$_;
diff --git a/rt4/sources/RT/vendor/share/html/m/_elements/menu b/rt4/sources/RT/vendor/share/html/m/_elements/menu
index 82ce90f..7a1eca7 100644
--- a/rt4/sources/RT/vendor/share/html/m/_elements/menu
+++ b/rt4/sources/RT/vendor/share/html/m/_elements/menu
@@ -89,7 +89,7 @@ my @menu = (
if ( $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch', Object => $RT::System))
{
- my @Objects = RT::SavedSearches->new( $session{CurrentUser} )->_PrivacyObjects;
+ my @Objects = RT::SavedSearches->new( $session{CurrentUser} )->ObjectsForLoading;
push @Objects, RT::System->new( $session{'CurrentUser'} )
if $session{'CurrentUser'}->HasRight(
Object => $RT::System,
diff --git a/rt4/sources/RT/vendor/share/html/m/ticket/reply b/rt4/sources/RT/vendor/share/html/m/ticket/reply
index a558d21..e31abae 100644
--- a/rt4/sources/RT/vendor/share/html/m/ticket/reply
+++ b/rt4/sources/RT/vendor/share/html/m/ticket/reply
@@ -210,6 +210,6 @@ if ( !$checks_failure && exists $ARGS{SubmitTicket} ) {
<%ARGS>
$id => undef
-$Action => 'reply'
+$Action => 'Respond'
$DefaultStatus => undef
</%ARGS>
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list