implemented username update

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index f6bcec1..ef4501a 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -124,6 +124,7 @@ sub load {
     return $self->load_myopac_payments if $path =~ m|opac/myopac/main_payments|;
     return $self->load_myopac_main if $path =~ m|opac/myopac/main|;
     return $self->load_myopac_update_email if $path =~ m|opac/myopac/update_email|;
+    return $self->load_myopac_update_username if $path =~ m|opac/myopac/update_username|;
     return $self->load_myopac_bookbags if $path =~ m|opac/myopac/lists|;
     return $self->load_myopac_bookbag_update if $path =~ m|opac/myopac/list/update|;
     return $self->load_myopac_circ_history if $path =~ m|opac/myopac/circ_history|;

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 0f650b6..b6ae91a 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -667,6 +667,36 @@ sub load_myopac_update_email {
     return $self->generic_redirect($url);
 }
 
+sub load_myopac_update_username {
+    my $self = shift;
+    my $e = $self->editor;
+    my $ctx = $self->ctx;
+    my $username = $self->cgi->param('username') || '';
+
+    unless($username and $username !~ /\s/) { # any other username restrictions?
+        $ctx->{invalid_username} = $username;
+        return Apache2::Const::OK;
+    }
+
+    if($username ne $e->requestor->usrname) {
+
+        my $evt = $U->simplereq(
+            'open-ils.actor', 
+            'open-ils.actor.user.username.update', 
+            $e->authtoken, $username);
+
+        if($U->event_equals($evt, 'USERNAME_EXISTS')) {
+            $ctx->{username_exists} = $username;
+            return Apache2::Const::OK;
+        }
+    }
+
+    my $url = $self->apache->unparsed_uri;
+    $url =~ s/update_username/prefs/;
+
+    return $self->generic_redirect($url);
+}
+
 sub load_myopac_bookbags {
     my $self = shift;
     my $e = $self->editor;

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
index 67e419d..36e6797 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
@@ -267,7 +267,7 @@ sub load_locale_handlers {
                     our %Lexicon = (%Lexicon, %{ Locale::Maketext::Lexicon::Gettext->parse(<F>) });
                     close F;
                 } else {
-                    warn "unable to open messages file: $messages"; 
+                    warn "EGWeb: unable to open messages file: $messages"; 
                 }
             }
 EVAL

diff --git a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
index 4b2f27b..28d4b2a 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
@@ -19,7 +19,7 @@
     </div>
 
     <div class="header_middle">
-        <span class="float-left">[% l('Current Items Checked Out') %]</span>
+        <span class="float-left">[% l('Previously Checked Out Items') %]</span>
         <span class='float-left' style='padding-left: 10px;'>
             [% IF offset > 0 %]
             <a href='circ_history?limit=[% limit %]&offset=[% offset - 1 %]'>[% l('Previous') %]</a>
@@ -37,22 +37,10 @@
 
     [% IF ctx.circs.size < 1 %]
     <div class="opac-auto-079">
-        <big><strong>[% l('You have no items checked out.') %]</strong></big>
+        <big><strong>[% l('There are no items in your circulation history.') %]</strong></big>
     </div>
     [% ELSE %]
 
-    [% IF ctx.success_renewals %]
-    <div class="renew-summary">
-        [% l("Successfully renewed [_1] item(s)", ctx.success_renewals) %]
-    </div>
-    [% END %]
-
-    [% IF ctx.failed_renewals %]
-    <div class="renew-summary red">
-        [% l("Failed to renew [_1] item(s)", ctx.failed_renewals) %]
-    </div>
-    [% END %]
-
     <div id='checked_main'>
         <table style='border-collapse:collapse;'>
             <thead id="acct_checked_main_header">
@@ -97,9 +85,12 @@
                             [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT); %]
                         </td>
                         <td style="padding-left:5px;">
-                            [% IF circ.circ.checkin_time; 
-                                date.format(ctx.parse_datetime(circ.circ.checkin_time),DATE_FORMAT); 
-                            END; %]
+                            [% 
+                                IF circ.circ.checkin_time; 
+                                    date.format(ctx.parse_datetime(circ.circ.checkin_time),DATE_FORMAT); 
+                                ELSE; %]
+                                <span style='color:blue;'>*</span><!-- meh -->
+                            [% END; %]
                         </td>
                         <td>[% circ.circ.target_copy.barcode %]</td>
                         <td>[% circ.circ.target_copy.call_number.label %]</td>

diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
index 5846c15..37cce3d 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
@@ -152,24 +152,14 @@
             <tr>
                 <td class='color_4 light_border'>
                     <div style="position:absolute">
-                        <div class="hide_me" style=
-                        "position:relative;left:70px;top:-3px;">
-                            <a href="#">
-                            <img alt="Username Help"
-                                 src=
-                                 "[% ctx.media_prefix %]/images/question-mark.png" /></a>
+                        <div class="hide_me" style="position:relative;left:70px;top:-3px;">
+                            <a href="#"><img alt="Username Help" src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
                         </div>
                     </div>[% l("Username") %]
                 </td>
 
-                <td class='light_border'
-                    id='myopac_summary_username'>[% ctx.user.usrname | html %]</td>
-
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   id='myopac_summary_username_change'
-                   style=
-                   'text-decoration: underline;'>[% l("Change") %]</a></td>
+                <td class='light_border'>[% ctx.user.usrname | html %]</td>
+                <td class='light_border'><a href='update_username'>[% l("Change") %]</a></td>
             </tr>
 
             <tr id='myopac_update_username_row'
@@ -242,26 +232,6 @@
                 <td class='light_border'><a href='update_email'>[% l('Change') %]</a></td>
             </tr>
 
-            <tr class='hide_me'>
-                <td class='myopac_update_cell' colspan='3'>
-                    <span class= 'myopac_update_span'>
-                        [% l("Enter new email address:") %]
-                    </span>
-                    <input type='text' size='24' />
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class= 'myopac_update_span'>
-                                [% l("Submit") %]</span>
-                        </button>
-                    </span>
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class='myopac_update_span'>
-                                [% l("Cancel") %]</span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
             [% IF ctx.user.ident_value %]<tr class="hide_me">
                 <td class='color_4 light_border'>
                 [% l("Primary Identification") %]</td>

diff --git a/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2
index 92aed44..2261c29 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/update_email.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2
@@ -1,7 +1,7 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
     WRAPPER "default/opac/parts/myopac/base.tt2";
-    myopac_page = "update_email"  %]
+    myopac_page = "prefs"  %]
 <div id='myopac_summary_div' style="padding:0px;">
 
 [% IF ctx.invalid_email %]