%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
<& /Elements/ListActions, actions => \@results &>
-<form action="<%RT->Config->Get('WebPath')%>/Admin/Users/Modify.html" method="post" enctype="multipart/form-data">
+<form action="<%RT->Config->Get('WebPath')%>/Admin/Users/Modify.html" method="post" enctype="multipart/form-data" name="<% $Create ? 'UserCreate': 'UserModify' %>">
%if ($Create) {
<input type="hidden" class="hidden" name="id" value="new" />
% } else {
<tr>
<td valign="top" class="boxcontainer">
-<&| /Widgets/TitleBox, title => loc('Identity') &>
+<&| /Widgets/TitleBox, title => loc('Identity'), class => 'user-info-identity' &>
<table>
<tr><td align="right">
<&|/l&>Username</&>:
</td><td>
-<input name="Name" value="<%$UserObj->Name||$Name||''%>" /> <strong><&|/l&>(required)</&></strong>
+<input name="Name" value="<%$UserObj->Name//$ARGS{Name}//''%>" /> <strong><&|/l&>(required)</&></strong>
</td></tr>
<tr><td align="right">
<&|/l&>Email</&>:
</td><td>
-<input name="EmailAddress" value="<%$UserObj->EmailAddress||$EmailAddress||''%>" />
+<input name="EmailAddress" value="<%$UserObj->EmailAddress//$ARGS{EmailAddress}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Real Name</&>:
+<&|/l&>Real Name</&>:
</td><td>
-<input name="RealName" value="<%$UserObj->RealName||$RealName||''%>" />
+<input name="RealName" value="<%$UserObj->RealName//$ARGS{RealName}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Nickname</&>:
+<&|/l&>Nickname</&>:
</td><td>
-<input name="NickName" value="<%$UserObj->NickName||$NickName||''%>" />
+<input name="NickName" value="<%$UserObj->NickName//$ARGS{NickName}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Unix login</&>:
+<&|/l&>Unix login</&>:
</td><td>
-<input name="Gecos" value="<%$UserObj->Gecos||$Gecos||''%>" />
+<input name="Gecos" value="<%$UserObj->Gecos//$ARGS{Gecos}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Language</&>:
+<&|/l&>Language</&>:
</td><td>
-<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang||$Lang &>
+<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang//$ARGS{Lang} &>
</td></tr>
<tr><td align="right">
-<&|/l&>Extra info</&>:
+<&|/l&>Extra info</&>:
</td><td>
-<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo||$FreeformContactInfo||''%></textarea>
+<textarea name="FreeformContactInfo" cols="20" rows="5"><%$UserObj->FreeformContactInfo//$ARGS{FreeformContactInfo}//''%></textarea>
</td></tr>
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
</table>
</&>
+
<br />
<&| /Widgets/TitleBox, title => loc('Customers') &>
</&>
<br />
-<&| /Widgets/TitleBox, title => loc('Access control') &>
+<&| /Widgets/TitleBox, title => loc('Access control'), class => 'user-info-access-control' &>
<input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked||''%> />
-<&|/l&>Let this user access RT</&><br />
+<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <% ($UserObj->Id && $UserObj->Disabled) ? '' : 'checked="checked"' |n%> />
+<label for="Enabled"><&|/l&>Let this user access RT</&></label><br />
+% my $PrivilegedChecked = ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $ARGS{Privileged})) ? 'checked="checked"' : '';
<input type="hidden" class="hidden" name="SetPrivileged" value="1" />
-<input type="checkbox" class="checkbox" name="Privileged" value="1" <%$PrivilegedChecked||''%> /> <&|/l&>Let this user be granted rights</&> (<&|/l&>Privileged</&>)<br />
+<input type="checkbox" class="checkbox" id="Privileged" name="Privileged" value="1" <%$PrivilegedChecked|n%> />
+<label for="Privileged"><&|/l&>Let this user be granted rights</&> (<&|/l&>Privileged</&>)</label><br />
<& /Elements/EditPassword,
User => $UserObj,
Name => [qw(CurrentPass Pass1 Pass2)],
&>
+
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Access control' &>
+
</&>
% $m->callback( %ARGS, CallbackName => 'LeftColumnBottom', UserObj => $UserObj );
</td>
<td valign="top" class="boxcontainer">
-<&| /Widgets/TitleBox, title => loc('Location') &>
+<&| /Widgets/TitleBox, title => loc('Location'), class => 'user-info-location' &>
<table>
<tr><td align="right">
-<&|/l&>Organization</&>:
+<&|/l&>Organization</&>:
</td><td>
-<input name="Organization" value="<%$UserObj->Organization||$Organization||''%>" />
+<input name="Organization" value="<%$UserObj->Organization//$ARGS{Organization}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Address1</&>:
+<&|/l&>Address1</&>:
</td><td>
-<input name="Address1" value="<%$UserObj->Address1||$Address1||''%>" />
+<input name="Address1" value="<%$UserObj->Address1//$ARGS{Address1}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>Address2</&>:
+<&|/l&>Address2</&>:
</td><td>
-<input name="Address2" value="<%$UserObj->Address2||$Address2||''%>" />
+<input name="Address2" value="<%$UserObj->Address2//$ARGS{Address2}//''%>" />
</td></tr>
<tr><td align="right">
-<&|/l&>City</&>:
+<&|/l&>City</&>:
</td><td>
-<input name="City" value="<%$UserObj->City||$City||''%>" size="14" />
+<input name="City" value="<%$UserObj->City//$ARGS{City}//''%>" size="14" />
</td></tr>
<tr><td align="right">
-<&|/l&>State</&>:
+<&|/l&>State</&>:
</td><td>
-<input name="State" value="<%$UserObj->State||$State||''%>" size="3" />
+<input name="State" value="<%$UserObj->State//$ARGS{State}//''%>" size="3" />
</td></tr>
<tr><td align="right">
-<&|/l&>Zip</&>:
+<&|/l&>Zip</&>:
</td><td>
-<input name="Zip" value="<%$UserObj->Zip||$Zip||''%>" size="9" />
+<input name="Zip" value="<%$UserObj->Zip//$ARGS{Zip}//''%>" size="9" />
</td></tr>
<tr><td align="right">
-<&|/l&>Country</&>:
+<&|/l&>Country</&>:
</td><td>
-<input name="Country" value="<%$UserObj->Country||$Country||''%>" />
+<input name="Country" value="<%$UserObj->Country//$ARGS{Country}//''%>" />
</td></tr>
+
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
+
</table>
</&>
<br />
-<&| /Widgets/TitleBox, title => loc('Phone numbers') &>
+<&| /Widgets/TitleBox, title => loc('Phone numbers'), class => 'user-info-phones' &>
<table>
<tr><td align="right">
-<&|/l&>Residence</&>:
+<&|/l&>Residence</&>:
</td><td>
-<input name="HomePhone" value="<%$UserObj->HomePhone||$HomePhone||''%>" size="13" /><br />
+<input name="HomePhone" value="<%$UserObj->HomePhone//$ARGS{HomePhone}//''%>" size="13" /><br />
</td></tr>
<tr><td align="right">
-<&|/l&>Work</&>:
+<&|/l&>Work</&>:
</td><td>
-<input name="WorkPhone" value="<%$UserObj->WorkPhone||$WorkPhone||''%>" size="13" /><br />
+<input name="WorkPhone" value="<%$UserObj->WorkPhone//$ARGS{WorkPhone}//''%>" size="13" /><br />
</td></tr>
<tr><td align="right">
-<&|/l&>Mobile</&>:
+<&|/l&>Mobile</&>:
</td><td>
-<input name="MobilePhone" value="<%$UserObj->MobilePhone||$MobilePhone||''%>" size="13" /><br />
+<input name="MobilePhone" value="<%$UserObj->MobilePhone//$ARGS{MobilePhone}//''%>" size="13" /><br />
</td></tr>
<tr><td align="right">
-<&|/l&>Pager</&>:
+<&|/l&>Pager</&>:
</td><td>
-<input name="PagerPhone" value="<%$UserObj->PagerPhone||$PagerPhone||''%>" size="13" /><br />
+<input name="PagerPhone" value="<%$UserObj->PagerPhone//$ARGS{PagerPhone}//''%>" size="13" /><br />
</td>
</tr>
+
+<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
+
</table>
</&>
<br />
-<&| /Widgets/TitleBox, title => loc('Custom Fields') &>
-<table>
-% my $CFs = $UserObj->CustomFields;
-% while (my $CF = $CFs->Next) {
-<tr valign="top"><td align="right">
-<% loc($CF->Name) %>:
-</td><td>
-% if ($UserObj->id) {
-<& /Elements/EditCustomField, %ARGS, Object => $UserObj, CustomField => $CF &>
-% } else {
-<& /Elements/EditCustomField, %ARGS, NamePrefix => 'Object-RT::User--CustomField-', CustomField => $CF &>
-% }
-</td></tr>
-% }
-</table>
-</&>
+
+<& /Elements/EditCustomFieldCustomGroupings, Object => $UserObj &>
+
% $m->callback( %ARGS, CallbackName => 'RightColumnBottom', UserObj => $UserObj );
</td></tr>
<tr>
<td colspan="2">
-<&| /Widgets/TitleBox, title => loc('Comments about this user') &>
-<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments||$Comments||''%></textarea>
+<&| /Widgets/TitleBox, title => loc('Comments about this user'), class => 'user-info-comments' &>
+<textarea class="comments" name="Comments" cols="80" rows="5" wrap="virtual"><%$UserObj->Comments//$ARGS{Comments}//''%></textarea>
</&>
%if (!$Create && $UserObj->Privileged) {
<br />
-<&| /Widgets/TitleBox, title => loc('Signature') &>
-<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature||$Signature||''%></textarea>
+<&| /Widgets/TitleBox, title => loc('Signature'), class => 'user-info-signature' &>
+<textarea class="signature" cols="80" rows="5" name="Signature" wrap="hard"><%$UserObj->Signature//$ARGS{Signature}//''%></textarea>
</&>
% }
<%INIT>
my $UserObj = RT::User->new($session{'CurrentUser'});
-my ($title, $PrivilegedChecked, $EnabledChecked, $Disabled, $result, @results);
++my ($title, @results);
my ($val, $msg);
+$ARGS{Privileged} = $ARGS{Privileged} ? 1 : 0;
+delete $ARGS{Privileged} unless $ARGS{SetPrivileged};
+
+$ARGS{Disabled} = $ARGS{Enabled} ? 0 : 1;
+delete $ARGS{Disabled} unless $ARGS{SetEnabled};
+
+my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
+ Organization RealName NickName Lang EmailEncoding WebEncoding
+ ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId
+ AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
+ Address2 City State Zip Country
+ );
+
if ($Create) {
$title = loc("Create a new user");
-}
-else {
-
- if ( defined $id && $id eq 'new') {
- ( $val, $msg ) = $UserObj->Create(
- Name => $Name,
- EmailAddress => $ARGS{'EmailAddress'},
- Name => $ARGS{'Name'},
- Comments => $ARGS{'Comments'},
- Signature => $ARGS{'Signature'},
- EmailAddress => $ARGS{'EmailAddress'},
- FreeformContactInfo => $ARGS{'FreeformContactInfo'},
- Organization => $ARGS{'Organization'},
- RealName => $ARGS{'RealName'},
- NickName => $ARGS{'NickName'},
- Lang => $ARGS{'Lang'},
- EmailEncoding => $ARGS{'EmailEncoding'},
- WebEncoding => $ARGS{'WebEncoding'},
- ExternalContactInfoId => $ARGS{'ExternalContactInfoId'},
- ContactInfoSystem => $ARGS{'ContactInfoSystem'},
- Gecos => $ARGS{'Gecos'},
- ExternalAuthId => $ARGS{'ExternalAuthId'},
- AuthSystem => $ARGS{'AuthSystem'},
- HomePhone => $ARGS{'HomePhone'},
- WorkPhone => $ARGS{'WorkPhone'},
- MobilePhone => $ARGS{'MobilePhone'},
- PagerPhone => $ARGS{'PagerPhone'},
- Address1 => $ARGS{'Address1'},
- Address2 => $ARGS{'Address2'},
- City => $ARGS{'City'},
- State => $ARGS{'State'},
- Zip => $ARGS{'Zip'},
- Country => $ARGS{'Country'},
- Privileged => $ARGS{'Privileged'},
- Disabled => ($ARGS{'Enabled'} ? 0 : 1)
- );
-
- if ($val) {
- push @results, $msg;
- push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
- } else {
- push @results, loc('User could not be created: [_1]', $msg);
- }
- } else {
- $UserObj->Load($id) || $UserObj->Load($Name)
- || Abort("Couldn't load user '" . ( $Name || '') . "'");
- $val = $UserObj->Id();
- }
+} elsif ( defined $id && $id eq 'new') {
+ ( $val, $msg ) = $UserObj->Create(
+ (map {($_ => $ARGS{$_})} @fields),
+ Privileged => $ARGS{'Privileged'},
+ Disabled => $ARGS{'Disabled'},
+ );
if ($val) {
- $title = loc("Modify the user [_1]", $UserObj->Name);
- }
-
- # If the create failed
- else {
- $title = loc("Create a new user");
- $Create = 1;
+ push @results, $msg;
+ push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
+ $title = loc("Modify the user [_1]", $UserObj->Name);
+ } else {
+ push @results, loc('User could not be created: [_1]', $msg);
+ $title = loc("Create a new user");
+ $Create = 1;
}
-}
-
-
-$m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef => \%ARGS, Results => \@results );
+} else {
+ $UserObj->Load($id) || $UserObj->Load($ARGS{Name})
+ || Abort("Couldn't load user '" . ( $ARGS{Name} || '') . "'");
+ $title = loc("Modify the user [_1]", $UserObj->Name);
-# If we have a user to modify, lets try.
-if ($UserObj->Id && $id ne 'new') {
-
- my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo
- Organization RealName NickName Lang EmailEncoding WebEncoding
- ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId
- AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
- Address2 City State Zip Country
- );
+ $m->callback( %ARGS, CallbackName => 'BeforeUpdate', User => $UserObj, ARGSRef => \%ARGS, Results => \@results );
my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
- Object => $UserObj,
- ARGSRef => \%ARGS );
+ Object => $UserObj,
+ ARGSRef => \%ARGS );
push (@results,@fieldresults);
push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
#deal with freeside customer links
push @results, ProcessObjectCustomers( ARGSRef => \%ARGS, Object => $UserObj );
- # {{{ Deal with special fields: Privileged, Enabled
- if ( $SetPrivileged and $Privileged != $UserObj->Privileged ) {
- my ($code, $msg) = $UserObj->SetPrivileged($Privileged);
- push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
+ if ( defined $ARGS{Privileged} and $ARGS{Privileged} != ($UserObj->Privileged || 0) ) {
+ my ($code, $msg) = $UserObj->SetPrivileged($ARGS{Privileged});
+ push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
}
- #we're asking about enabled on the web page but really care about disabled.
- $Disabled = $Enabled ? 0 : 1;
-
- if ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) {
- my ($code, $msg) = $UserObj->SetDisabled($Disabled);
+ if ( defined $ARGS{Disabled} and $ARGS{Disabled} != $UserObj->Disabled ) {
+ my ($code, $msg) = $UserObj->SetDisabled($ARGS{Disabled});
push @results, $msg;
}
-
-
}
-
-my %password_cond = $UserObj->CurrentUserRequireToSetPassword;
if ( $UserObj->Id ) {
# Deal with Password field
my ($status, $msg) = $UserObj->SafeSetPassword(
}
}
-
-# Do some setup for the ui
-unless ( $UserObj->id && $UserObj->Disabled ) {
- $EnabledChecked = 'checked="checked"';
-}
-
-if ((!$Create && $UserObj->Privileged()) or (!$UserObj->Id and $Privileged)) {
- $PrivilegedChecked = 'checked="checked"';
-}
-
# This code does automatic redirection if any updates happen.
MaybeRedirectForResults(
Actions => \@results,
<%ARGS>
$id => undef
-$Name => undef
-$Comments => undef
-$Signature => undef
-$EmailAddress => undef
-$FreeformContactInfo => undef
-$Organization => undef
-$RealName => undef
-$NickName => undef
-$Privileged => undef
-$SetPrivileged => undef
-$Enabled => undef
-$SetEnabled => undef
-$Lang => undef
-$EmailEncoding => undef
-$WebEncoding => undef
-$ExternalContactInfoId => undef
-$ContactInfoSystem => undef
-$Gecos => undef
-$ExternalAuthId => undef
-$AuthSystem => undef
-$HomePhone => undef
-$WorkPhone => undef
-$MobilePhone => undef
-$PagerPhone => undef
-$Address1 => undef
-$Address2 => undef
-$City => undef
-$State => undef
-$Zip => undef
-$Country => undef
$CurrentPass => undef
$Pass1 => undef
$Pass2 => undef
projects / freeside.git / blobdiff