[Rt-commit] r2526 - in rt/branches/3.4-RELEASE: . html/Elements
html/Search/Elements
jesse at bestpractical.com
jesse at bestpractical.com
Mon Mar 28 05:25:04 EST 2005
Author: jesse
Date: Mon Mar 28 05:25:03 2005
New Revision: 2526
Modified:
rt/branches/3.4-RELEASE/ (props changed)
rt/branches/3.4-RELEASE/html/Elements/SelectOwner
rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString
rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat
rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics
Log:
r10271 at hualien: jesse | 2005-03-28 15:49:42 +0800
* A bunch of minor search query builder cleanup and loc improvements
Modified: rt/branches/3.4-RELEASE/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.4-RELEASE/html/Elements/SelectOwner (original)
+++ rt/branches/3.4-RELEASE/html/Elements/SelectOwner Mon Mar 28 05:25:03 2005
@@ -45,10 +45,16 @@
%# END BPS TAGGED BLOCK }}}
<SELECT NAME="<%$Name%>">
%if ($DefaultValue) {
-<OPTION <% !$Default && "SELECTED" %> VALUE=""><%$DefaultLabel%></OPTION>
+<OPTION <% !$Default ? "SELECTED" : '' %> VALUE=""><%$DefaultLabel%></OPTION>
%}
%foreach my $User ( @users) {
-<OPTION <% ($User->Id == $Default) && "SELECTED" %> VALUE="<%$User->Id()%>"><%$User->Name()%></OPTION>
+<OPTION <% ($User->Id == $Default) ? "SELECTED" : ''%>
+%if ($ValueAttribute eq 'id') {
+ value="<%$User->id%>"
+%} elsif ($ValueAttribute eq 'Name') {
+ value="<%$User->Name%>"
+%}
+><%$User->Name()%></OPTION>
%}
</SELECT>
<%INIT>
@@ -97,5 +103,6 @@
$TicketObj => undef
$DefaultValue => 1
$DefaultLabel => "-"
+$ValueAttribute => 'id'
$cfqueues => undef
</%ARGS>
Modified: rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString (original)
+++ rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString Mon Mar 28 05:25:03 2005
@@ -66,33 +66,52 @@
# All the things we can display in the format string by default
my @fields = qw(
- QueueName
- OwnerName
- id Status
- Subject ExtendedStatus
- Priority InitialPriority
- FinalPriority Type
- TimeWorked TimeLeft
- TimeEstimated Requestors
- Cc AdminCc
- StartsRelative StartedRelative
- CreatedRelative LastUpdatedRelative
- ToldRelative DueRelative
- ResolvedRelative Starts
- Started Created
- CreatedBy LastUpdated
- LastUpdatedBy Told
- Due Resolved
- NEWLINE RefersTo
- ReferredToBy DependsOn
- DependedOnBy MemberOf
- Members Parents
- Children -
+ id
+ Status
+ ExtendedStatus
+ Subject
+ QueueName
+ OwnerName
+ Priority
+ InitialPriority
+ FinalPriority
+ Type
+ TimeWorked
+ TimeLeft
+ TimeEstimated
+ CreatedBy
+ LastUpdatedBy
+ Requestors
+ Cc
+ AdminCc
+ Starts
+ StartsRelative
+ Started
+ StartedRelative
+ Created
+ CreatedRelative
+ LastUpdated
+ LastUpdatedRelative
+ Told
+ ToldRelative
+ Due
+ DueRelative
+ Resolved
+ ResolvedRelative
+ RefersTo
+ ReferredToBy
+ DependsOn
+ DependedOnBy
+ MemberOf
+ Members
+ Parents
+ Children
+ NEWLINE
);
my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
-foreach (keys %cfqueues) {
- my $id = $_;
+foreach my $id (keys %cfqueues) {
+ # What does this _do_? What are the keys to cfqueues
$id =~ s/^.'*(.*).'*$/$1/;
# Gotta load up the $queue object, since queues get stored by name now.
my $queue = RT::Queue->new($session{'CurrentUser'});
@@ -173,9 +192,7 @@
$column{Suffix} .= "</a>";
}
elsif ( $Link eq "Take" ) {
- $column{Prefix} .=
- "<A HREF=\""
- . $RT::WebPath
+ $column{Prefix} .= "<A HREF=\"" . $RT::WebPath
. "/Ticket/Display.html?Action=Take&id=__id__\">";
$column{Suffix} .= "</a>";
}
Modified: rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
==============================================================================
--- rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions (original)
+++ rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions Mon Mar 28 05:25:03 2005
@@ -54,12 +54,12 @@
<tr>
<td class=label>
<&|/l&>Order by</&>:
-</td><td class=label>
+</td><td class=value>
<select name="OrderBy">
% foreach my $field (keys %fields) {
% next unless $field;
<option value=<%$field%>
-% if ($field eq $OrderBy) {
+% if ($field =~ /$OrderBy/i) {
SELECTED
% }
><%$field%></option>
@@ -81,7 +81,7 @@
</tr>
<td class=label>
<&|/l&>Rows per page</&>:
-</td><td>
+</td><td class="value">
<& /Elements/SelectResultsPerPage,
Name => "RowsPerPage",
Default => $RowsPerPage &>
@@ -97,6 +97,8 @@
my $tickets = new RT::Tickets($session{'CurrentUser'});
my %fields = %{$tickets->FIELDS};
map { $fields{$_}->[0] =~ /^(?:ENUM|INT|DATE|STRING)$/ || delete $fields{$_} } keys %fields;
+delete $fields{'EffectiveId'};
+
</%INIT>
Modified: rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat
==============================================================================
--- rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat (original)
+++ rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat Mon Mar 28 05:25:03 2005
@@ -49,7 +49,7 @@
<&|/l&>Add Columns</&>:
</td>
<td>
-Format:
+<&|/l&>Format</&>:
</td>
<td></td>
<td>
@@ -59,32 +59,27 @@
<td valign=top>
<select size="6" name="SelectDisplayColumns" multiple>
% foreach my $field ( @$AvailableColumns) {
-<option value="<%$field%>"><%
-loc($m->comp(
- '/Elements/RT__Ticket/ColumnMap',
- Name => $field,
- Attr => 'title'
- )
- || $field) %></option>
+<option value="<%$field%>"><% loc( $field) %></option>
+%# $m->comp( '/Elements/RT__Ticket/ColumnMap', Name => $field, Attr => 'title') ||
% }
</select>
</td>
<td>
-Link:
-<select name=Link>
+<&|/l&>Link</&>:
+<select name="Link">
<option value="None">-</option>
<option value="Display"><&|/l&>Display</&></option>
<option value="Take"><&|/l&>Take</&></option>
</select>
-<br>Title: <input name="Title" size=10>
-<br>Size:
-<select name=Size>
+<br><&|/l&>Title</&>: <input name="Title" size=10>
+<br><&|/l&>Size</&>:
+<select name="Size">
<option value="">-</option>
<option value="Small"><&|/l&>Small</&></option>
<option value="Large"><&|/l&>Large</&></option>
</select>
-<br>Face:
-<select name=Face>
+<br><&|/l&>Style</&>:
+<select name="Face">
<option value="">-</option>
<option value="Bold"><&|/l&>Bold</&></option>
<option value="Italic"><&|/l&>Italic</&></option>
@@ -98,11 +93,7 @@
% my $i=0;
% foreach my $field (@$CurrentFormat) {
<option value="<%$i++%>><%$field->{Column}%>">
-<%loc($m->comp(
- '/Elements/RT__Ticket/ColumnMap',
- Name => $field->{Column},
- Attr => 'title'
- ) || $field->{Column}) %></option>
+<%loc( $field->{Column}) %></option>
% }
</select>
<br>
Modified: rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics (original)
+++ rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics Mon Mar 28 05:25:03 2005
@@ -108,7 +108,7 @@
FalseVal => '!='
&>
</td><td>
-<& /Elements/SelectOwner, Name => "ValueOfActor" &>
+<& /Elements/SelectOwner, Name => "ValueOfActor", ValueAttribute => 'Name' &>
</td>
</tr>
<tr>
More information about the Rt-commit
mailing list