[Rt-commit] r6796 - in rt/branches/3.7-EXPERIMENTAL: .
html/Admin/CustomFields html/Admin/Elements html/Admin/Groups
html/Admin/Queues html/Admin/Users html/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Tue Jan 23 13:09:53 EST 2007
Author: ruz
Date: Tue Jan 23 13:09:51 2007
New Revision: 6796
Modified:
rt/branches/3.7-EXPERIMENTAL/ (props changed)
rt/branches/3.7-EXPERIMENTAL/html/Admin/CustomFields/UserRights.html
rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectModifyUser
rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectNewGroupMembers
rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectUsers
rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/UserRights.html
rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/UserRights.html
rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html
rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/index.html
rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
Log:
r4428 at cubic-pc: cubic | 2007-01-23 21:18:08 +0300
* display users' entries via one comp
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/CustomFields/UserRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/CustomFields/UserRights.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/CustomFields/UserRights.html Tue Jan 23 13:09:51 2007
@@ -60,9 +60,7 @@
% my $group = RT::Group->new($session{'CurrentUser'});
% $group->LoadACLEquivalenceGroup($Member->MemberObj);
<tr align="right">
- <td valign="top">
- <% $UserObj->Name %>
- </td>
+ <td valign="top"><& /Ticket/Elements/ShowUserEntry, User => $UserObj &></td>
<td>
<& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
Object => $CustomFieldObj &>
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectModifyUser
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectModifyUser (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectModifyUser Tue Jan 23 13:09:51 2007
@@ -44,7 +44,7 @@
%#
%# END BPS TAGGED BLOCK }}}
%while ( $user = $users->Next) {
-<a href="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><br />
+<a href="Modify.html?id=<%$user->id%>"><%$user->id%>: <& /Ticket/Elements/ShowUserEntry, User => $user &></a><br />
%}
<%INIT>
my ($user);
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectNewGroupMembers
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectNewGroupMembers (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectNewGroupMembers Tue Jan 23 13:09:51 2007
@@ -43,22 +43,23 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% if ($Show ne 'Groups') {
+% if ( $Show ne 'Groups' ) {
<b><&|/l&>Users</&></b>
-<select multiple name="<% $Name %>Users" size="10">
+<select multiple name="<% $Name %>Users" size="10">
% while ( my $user = $users->Next ) {
-% next if $SkipUsers->{$user->id};
-<option value="User-<%$user->id%>"><%$user->Name%></option>
+% next if $SkipUsers->{ $user->id };
+<option value="User-<% $user->id %>"><& /Ticket/Elements/ShowUserEntry, User => $user &></option>
% }
</select>
<br />
% }
-% if ($Show ne 'Users') {
+
+% if ( $Show ne 'Users' ) {
<b><&|/l&>Groups</&></b>
-<select multiple name="<% $Name %>Groups" size="10">
+<select multiple name="<% $Name %>Groups" size="10">
% while ( my $group = $groups->Next ) {
-% next if $SkipGroups->{$group->id};
-<option value="Group-<%$group->id%>"><%$group->Name%></option>
+% next if $SkipGroups->{ $group->id };
+<option value="Group-<% $group->id %>"><% $group->Name %></option>
% }
</select>
% }
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectUsers
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectUsers (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/SelectUsers Tue Jan 23 13:09:51 2007
@@ -43,10 +43,12 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<select multiple name="<%$Name%>" size="10">
-%while (my $user = $users->Next) {
-<option value="<%$user->id%>"><%$user->Name%>
-%}
+<select multiple name="<% $Name %>" size="10">
+% while ( my $user = $users->Next ) {
+<option value="<% $user->id %>">\
+<& /Ticket/Elements/ShowUserEntry, User => $user &>\
+</option>
+% }
</select>
<%INIT>
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/UserRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/UserRights.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Global/UserRights.html Tue Jan 23 13:09:51 2007
@@ -52,30 +52,26 @@
<form method="post" action="UserRights.html">
<&| /Widgets/TitleBox, title => loc('Modify global user rights.') &>
-
<table>
-
-% while (my $Member = $Users->Next()) {
-% my $UserObj = $Member->MemberObj->Object();
+
+% while ( my $Member = $Users->Next ) {
+% my $UserObj = $Member->MemberObj->Object;
% my $group = RT::Group->new($session{'CurrentUser'});
-% $group->LoadACLEquivalenceGroup($Member->MemberObj);
- <tr align="right">
- <td valign="top">
- <% $UserObj->Name %>
- </td>
- <td>
- <& /Admin/Elements/SelectRights, PrincipalId => $group->PrincipalId,
- Object => $RT::System &>
- </td>
- </tr>
+% $group->LoadACLEquivalenceGroup( $Member->MemberObj );
+ <tr align="right">
+ <td valign="top"><& /Ticket/Elements/ShowUserEntry, User => $UserObj &></td>
+ <td><& /Admin/Elements/SelectRights,
+ PrincipalId => $group->PrincipalId,
+ Object => $RT::System,
+ &></td>
+ </tr>
% }
</table>
-
- </&>
- <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
+</&>
+
+<& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
- </form>
-
+</form>
<%INIT>
#Update the acls.
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/UserRights.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Groups/UserRights.html Tue Jan 23 13:09:51 2007
@@ -54,29 +54,25 @@
<input type="hidden" class="hidden" name="id" value="<% $GroupObj->id %>" />
<&| /Widgets/TitleBox, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
-
<table>
-
-% while (my $Member = $Users->Next()) {
-% my $UserObj = $Member->MemberObj->Object();
- <tr align="right">
- <td valign="top">
- <% $UserObj->Name %>
- </td>
- <td>
- <& /Admin/Elements/SelectRights, PrincipalId => $Member->MemberObj->Id,
- PrincipalType => 'User',
- Object => $GroupObj &>
- </td>
- </tr>
+% while ( my $Member = $Users->Next ) {
+% my $UserObj = $Member->MemberObj->Object;
+ <tr align="right">
+ <td valign="top"><& /Ticket/Elements/ShowUserEntry, User => $UserObj &></td>
+ <td><& /Admin/Elements/SelectRights,
+ PrincipalId => $Member->MemberObj->Id,
+ PrincipalType => 'User',
+ Object => $GroupObj,
+ &></td>
+ </tr>
% }
- </table>
-
- </&>
- <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
-
- </form>
-
+</table>
+</&>
+
+<& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
+
+</form>
+
<%INIT>
#Update the acls.
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/UserRights.html Tue Jan 23 13:09:51 2007
@@ -61,9 +61,7 @@
% my $group = RT::Group->new($session{'CurrentUser'});
% $group->LoadACLEquivalenceGroup($Member->MemberObj);
<tr align="right">
- <td valign="top">
- <% $UserObj->Name %>
- </td>
+ <td valign="top"><& /Ticket/Elements/ShowUserEntry, User => $UserObj &></td>
<td>
<& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
Object => $QueueObj &>
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/index.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/index.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/index.html Tue Jan 23 13:09:51 2007
@@ -51,18 +51,19 @@
<h1><%$caption%></h1>
<p><&|/l&>Select a user</&>:</p>
<ul>
-%if ($users->Count == 0) {
+% unless ( $users->Count ) {
<li><em><&|/l&>No users matching search criteria found.</&></em></li>
% }
-%my @ids;
-%while ( $user = $users->Next) {
+
+% my @ids;
+% while ( $user = $users->Next ) {
% push @ids, $user->Id;
-<li><a href="Modify.html?id=<%$user->id%>"><%$user->Name || loc('(no name listed)')%></a></li>
+<li><a href="Modify.html?id=<% $user->id %>"><& /Ticket/Elements/ShowUserEntry, User => $user &></a></li>
%}
</ul>
-%if (my $ids = join(',', @ids)) {
+% if ( my $ids = join(',', @ids) ) {
<em>(<a href="<%RT->Config->Get('WebPath')%>/Download/Tabular/User/<% $ids %>/Users.tsv"><&|/l&>Download as a tab-delimited file</&></a>)</em><br />
-%}
+% }
<br /><br />
<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Users/index.html">
Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner Tue Jan 23 13:09:51 2007
@@ -54,7 +54,7 @@
%} elsif ($ValueAttribute eq 'Name') {
value="<%$User->Name%>"
%}
-><%$User->Name()%></option>
+><& /Ticket/Elements/ShowUserEntry, User => $User &></option>
%}
</select>
<%INIT>
More information about the Rt-commit
mailing list