[Rt-commit] r3334 - in rt/branches/CHALDEA-EXPERIMENTAL: . etc html/Admin/Elements lib lib/RT

jesse at bestpractical.com jesse at bestpractical.com
Sun Jul 3 18:12:31 EDT 2005


Author: jesse
Date: Sun Jul  3 18:12:31 2005
New Revision: 3334

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_SiteConfig.pm
   rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/EditScrips
   rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/ListGlobalScrips
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT.pm.in
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
   rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/User_Overlay.pm
Log:
 r22150 at hualien:  jesse | 2005-07-03 17:50:31 -0400
  r22102 at hualien:  jesse | 2005-07-03 16:26:30 -0400
   r21954 at hualien:  jesse | 2005-06-27 11:40:16 -0400
    r20564 at hualien (orig r3181):  alexmv | 2005-06-15 17:52:14 -0400
    
    r20798 at hualien (orig r3224):  kevinr | 2005-06-18 22:26:40 -0400
     r4487 at sad-girl-in-snow:  kevinr | 2005-06-18 21:23:04 -0500
     * Fixed a typo
     * now use $RT::WebAddress because it's a good idea
     * now localize 'Scrip' and number, instead of only the former
    
    r20799 at hualien (orig r3225):  kevinr | 2005-06-18 22:26:51 -0400
    
    r20800 at hualien (orig r3226):  kevinr | 2005-06-18 22:37:51 -0400
     r4496 at sad-girl-in-snow:  kevinr | 2005-06-18 21:37:27 -0500
     * Fixes possible cross-site scripting bug.
    
    r20801 at hualien (orig r3227):  jesse | 2005-06-18 23:47:04 -0400
    * Fixed typo in kevin's fix (/l is a filter. it needs the |)
    
    r21566 at hualien (orig r3240):  alexmv | 2005-06-23 16:57:51 -0400
     r4466 at zoq-fot-pik:  chmrr | 2005-06-23 16:58:19 -0400
      * Document Set() a little better
    
    r21567 at hualien (orig r3241):  alexmv | 2005-06-23 16:57:54 -0400
     r4467 at zoq-fot-pik:  chmrr | 2005-06-23 16:58:52 -0400
      * Doc that CanonicalizeEmailAddress may be called as static
    
    r21568 at hualien (orig r3242):  alexmv | 2005-06-23 16:58:02 -0400
     r4468 at zoq-fot-pik:  chmrr | 2005-06-23 16:59:51 -0400
      * Remove possible closure issue (my $foo = .... if $bar;)
    
    r21569 at hualien (orig r3243):  alexmv | 2005-06-23 16:58:14 -0400
     r4469 at zoq-fot-pik:  chmrr | 2005-06-23 17:00:09 -0400
      * Escape queue name properly
    
    r21570 at hualien (orig r3244):  alexmv | 2005-06-23 17:37:31 -0400
     r4481 at zoq-fot-pik:  chmrr | 2005-06-23 17:39:53 -0400
      * Actually fix the escaping bug
    
    r21571 at hualien (orig r3245):  alexmv | 2005-06-23 17:43:57 -0400
     r4483 at zoq-fot-pik:  chmrr | 2005-06-23 17:46:18 -0400
     RT-Ticket: 6782
     RT-Update: correspond
     RT-Status: resolved
     
      * Fix perl invocation; thanks to Kim Toms <kim.toms at gmail.com>
    
    r21572 at hualien (orig r3246):  alexmv | 2005-06-23 17:48:26 -0400
     r4485 at zoq-fot-pik:  chmrr | 2005-06-23 17:50:48 -0400
     RT-Ticket: 6781
     RT-Update: correspond
     RT-Status: resolved
     
      * _AddWatcher takes Email, not Person; thanks to Andreas Jakum <ajakum at inode.at>
    
   
  
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_SiteConfig.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_SiteConfig.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_SiteConfig.pm	Sun Jul  3 18:12:31 2005
@@ -12,7 +12,7 @@
 # going to run into trouble. To check your SiteConfig file, use
 # this comamnd:
 #
-#   perl -C /path/to/your/etc/RT_SiteConfig.pm
+#   perl -c /path/to/your/etc/RT_SiteConfig.pm
 
 Set( $rtname, 'example.com');
 Set( $DevelMode => 1);

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/EditScrips
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/EditScrips	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/EditScrips	Sun Jul  3 18:12:31 2005
@@ -48,7 +48,7 @@
 <form action="Scrips.html" method="post">
 <input type="hidden" name="id" value="<%$id%>">
 
-<P><&|/l&>Current Scrips</&>:</P>
+<h2><&|/l&>Current Scrips</&></h2>
 % if ($Scrips->Count == 0 ) {
 <P><i><&|/l&>(No scrips)</&></i></P>
 % } else {

Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/ListGlobalScrips
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/ListGlobalScrips	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Admin/Elements/ListGlobalScrips	Sun Jul  3 18:12:31 2005
@@ -43,16 +43,32 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-%   my $count = 0;
+
+% if ($Scrips->Count == 0) {
+
+<P><i><&|/l&>(No scrips)</&></i></P>
+
+% } else {
+
+<UL>
+
 %   while (my $scrip = $Scrips->Next ) {
-%   $count++;
-<font size="-1"><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></font>
-<BR>
-%   }
-%   if (!$count) {
-<font size="-1"><&|/l&>(No scrips)</&></font>
+<LI>
+<a href="<%$RT::WebPath%>/Admin/Global/Scrip.html?id=<%$scrip->Id%>&Queue=<%0%>">
+% if ($scrip->Description) {
+<%   $scrip->Description %> 
+% } else {
+<i>(<&|/l, $scrip->Id&>Scrip #[_1]</&>)</i>
+% }
+</a><br>
+<small><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></small>
+</LI>
 %   }
 
+</UL>
+
+% }
+
 <%init>
 my $Scrips = new RT::Scrips ($session{'CurrentUser'});
 $Scrips->LimitToGlobal();

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT.pm.in
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT.pm.in	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT.pm.in	Sun Jul  3 18:12:31 2005
@@ -112,8 +112,16 @@
 
 =head2 LoadConfig
 
-Load RT's config file. First, go after the core config file. 
-After that, go after the site config.
+Load RT's config file.  First, the site configuration file
+(C<RT_SiteConfig.pm>) is loaded, in order to establish overall site
+settings like hostname and name of RT instance.  Then, the core
+configuration file (C<RT_Config.pm>) is loaded to set fallback values
+for all settings; it bases some values on settings from the site
+configuration file.
+
+In order for the core configuration to not override the site's
+settings, the function C<Set> is used; it only sets values if they
+have not been set already.
 
 =cut
 

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	Sun Jul  3 18:12:31 2005
@@ -1167,14 +1167,14 @@
 
     my $watcher;
     foreach $watcher ( @{ $args{'Cc'} } ) {
-        $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1 );
+        $self->_AddWatcher( Type => 'Cc', Email => $watcher, Silent => 1 );
     }
     foreach $watcher ( @{ $args{'AdminCc'} } ) {
-        $self->_AddWatcher( Type => 'AdminCc', Person => $watcher,
+        $self->_AddWatcher( Type => 'AdminCc', Email => $watcher,
             Silent => 1 );
     }
     foreach $watcher ( @{ $args{'Requestor'} } ) {
-        $self->_AddWatcher( Type => 'Requestor', Person => $watcher,
+        $self->_AddWatcher( Type => 'Requestor', Email => $watcher,
             Silent => 1 );
     }
 

Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/User_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/User_Overlay.pm	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/User_Overlay.pm	Sun Jul  3 18:12:31 2005
@@ -669,7 +669,9 @@
 
 CanonicalizeEmailAddress converts email addresses into canonical form.
 it takes one email address in and returns the proper canonical
-form. You can dump whatever your proper local config is in here
+form. You can dump whatever your proper local config is in here.  Note
+that it may be called as a static method; in this case, $self may be
+undef.
 
 =cut
 


More information about the Rt-commit mailing list