[Rt-commit] r9660 - in rt/branches/3.6-EXPERIMENTAL-CATEGORIES: html/Admin/Elements html/Admin/Groups html/Widgets

[falcone at bestpractical.com]

Author: falcone
Date: Tue Nov 13 19:09:29 2007
New Revision: 9660

Modified:
   rt/branches/3.6-EXPERIMENTAL-CATEGORIES/   (props changed)
   rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Elements/ConfigureMyRT
   rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Groups/Modify.html
   rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/SelectionBox
   rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/TitleBoxStart

Log:
merge down 3.6-release into the cateogories branch

Modified: rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Elements/ConfigureMyRT
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Elements/ConfigureMyRT	(original)
+++ rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Elements/ConfigureMyRT	Tue Nov 13 19:09:29 2007
@@ -64,15 +64,35 @@
         AutoSave  => 1,
         OnSubmit  => sub {
             my $sel = shift;
-            $portlets->{$pane} = [
-                map { m/(\w+)-(.*)$}/;
-                      { type => $1,
-                        name => $2 } } @{ $sel->{Current} }
-            ];
+
+            my @res;
+            foreach my $e ( @{ $sel->{Current} } ) {
+                my %row;
+                @row{qw(type name id)} = split /-/, $e, 3;
+                my $old = ( grep {
+                    ($_->{'type'}||'') eq ($row{'type'}||'')
+                    && ($_->{'name'}||'') eq ($row{'name'}||'')
+                    && ($_->{'id'}||'') eq ($row{'id'}||'')
+                } @{ $portlets->{$pane} || [] } )[0];
+                %row = %$old if $old;
+                push @res, \%row;
+            }
+
+            $portlets->{$pane} = \@res;
             $OnSave->( $portlets, $pane );
         },
-        Selected => [ map { join( '-', @{$_}{qw/type name/} ) }
-                      @{ $portlets->{$pane} } ]
+        Selected => [
+            map {
+                join( '-', grep $_, @{$_}{qw/type name id/} )
+            } @{ $portlets->{$pane} }
+        ],
+        Label => {
+            map {
+                join( '-', grep $_, @{$_}{qw/type name id/} ),
+                $_->{'label'}
+            }
+            grep $_->{'label'}, @{ $portlets->{$pane} }
+        },
     );
 }
 

Modified: rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Groups/Modify.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Groups/Modify.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Admin/Groups/Modify.html	Tue Nov 13 19:09:29 2007
@@ -77,7 +77,10 @@
 <tr valign="top"><td align="right">
 <% $CF->Name %>:
 </td><td>
-<& /Elements/EditCustomField, CustomField => $CF, Object => $Group &>
+<& /Elements/EditCustomField, CustomField => $CF, 
+                              Object => $Group, 
+                              ($Create ? (NamePrefix => 'Object-RT::Group--CustomField-') 
+                                       : () )&>
 </td></tr>
 % }
 <tr>

Modified: rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/SelectionBox
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/SelectionBox	(original)
+++ rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/SelectionBox	Tue Nov 13 19:09:29 2007
@@ -84,7 +84,9 @@
 
 <%method new>
 <%init>
-$ARGS{_item_map} = {map {$_->[0] => $_->[1]} @{$ARGS{Available}}};
+$ARGS{_item_map} = { map { $_->[0] => $_->[1] } @{ $ARGS{Available} } };
+$ARGS{_item_map} = { %{ $ARGS{_item_map} }, %{ $ARGS{'Label'} } }
+    if $ARGS{'Label'};
 return \%ARGS;
 </%init>
 </%method>
@@ -198,7 +200,7 @@
 % if (exists $selected{$_}) {
 selected="selected"
 % }
-><% $self->{_item_map}{$_} %></option>
+><% $self->{_item_map}{$_} || $_ %></option>
 % }
 </select>
  <input name="moveup" type="submit" class="button" value=" &uarr; " />

Modified: rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/TitleBoxStart
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/TitleBoxStart	(original)
+++ rt/branches/3.6-EXPERIMENTAL-CATEGORIES/html/Widgets/TitleBoxStart	Tue Nov 13 19:09:29 2007
@@ -64,8 +64,6 @@
 $title_class => ''
 $titleright_href => undef
 $titleright => undef
-$contentbg => "#dddddd"
-$color => "#336699"
 $id => ''
 $hideable => 1
 </%ARGS>