[Rt-commit] r13450 - in rt/3.8/trunk: . share/html/Dashboards/Elements

[sartak at bestpractical.com]

Author: sartak
Date: Fri Jun 20 12:36:40 2008
New Revision: 13450

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Dashboards/Elements/SelectPrivacy
   rt/3.8/trunk/share/html/Dashboards/Modify.html

Log:
 r62971 at dhcp32:  sartak | 2008-06-20 11:36:26 -0500
 Use selected="selected" on the dashboard's current privacy


Modified: rt/3.8/trunk/share/html/Dashboards/Elements/SelectPrivacy
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Elements/SelectPrivacy	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Elements/SelectPrivacy	Fri Jun 20 12:36:40 2008
@@ -48,13 +48,17 @@
 <%args>
 @Objects => undef
 $Name => undef
+$Default => undef
 </%args>
 <select name="<%$Name%>">
 % foreach my $object (@Objects) {
+% my $privacy = ref($object) . '-' . $object->id;
+% my $selected = $privacy eq ($Default || '') ? 'selected="selected"' : '';
+
 % if (ref($object) eq 'RT::User' && $object->id == $session{'CurrentUser'}->Id) {
-<option value="<%ref($object)%>-<%$object->id%>"><&|/l&>My dashboards</&></option>
+<option <%$selected%> value="<%$privacy%>"><&|/l&>My dashboards</&></option>
 % } else {
-<option value="<%ref($object)%>-<%$object->id%>"><&|/l, $object->Name&>[_1]'s dashboards</&></option>
+<option <%$selected%> value="<%$privacy%>"><&|/l, $object->Name&>[_1]'s dashboards</&></option>
 % }
 % }
 </select>

Modified: rt/3.8/trunk/share/html/Dashboards/Modify.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Modify.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Modify.html	Fri Jun 20 12:36:40 2008
@@ -69,10 +69,10 @@
 <tr><td align="right">
 <&|/l&>Privacy</&>:
 </td><td>
-<& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies &>
+<& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies, Default => $Dashboard->Privacy &>
 </td></tr>
 </table>
-<& /Elements/Submit, Label => loc('Save Changes') &>
+<& /Elements/Submit, Name => 'Save', Label => loc('Save Changes') &>
 </form>
 <%INIT>
 
@@ -130,7 +130,7 @@
     }
 }
 
-if (!$Create && !$tried_create && $id && defined($ARGS{'Name'})) {
+if (!$Create && !$tried_create && $id && $ARGS{'Save'}) {
     my ($ok, $msg);
     if ($session{'CurrentUser'}->HasRight(Right => 'ModifyDashboard', Object => $RT::System)) {
         ($ok, $msg) = $Dashboard->Update(Privacy  => $ARGS{'Privacy'},