View | Details | Raw Unified | Return to bug 28073
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-2 / +4 lines)
Lines 6-14 Link Here
6
    <ul>
6
    <ul>
7
        [% IF ( has_modifications ) %]
7
        [% IF ( has_modifications ) %]
8
            <li class="has_modifications">
8
            <li class="has_modifications">
9
                <span class="circ-hlt">Pending modifications:</span> Patron has pending modifications.
9
                <span class="circ-hlt">Pending modifications:</span>
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
10
                [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
11
                        <a href="/cgi-bin/koha/members/members-update.pl">View all pending patron modifications</a>
11
                    <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a>
12
                [% ELSE %]
13
                    Patron has pending modifications
12
                [% END %]
14
                [% END %]
13
            </li>
15
            </li>
14
        [% END %]
16
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-12 / +21 lines)
Lines 114-122 Link Here
114
                    <div id="pending_updates">
114
                    <div id="pending_updates">
115
                            [% FOREACH pm IN PendingModifications %]
115
                            [% FOREACH pm IN PendingModifications %]
116
                                [% SET borrowernumber = pm.borrowernumber %]
116
                                [% SET borrowernumber = pm.borrowernumber %]
117
                                <h3><a href="#panel_modify_[% pm.borrowernumber | uri %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 %]</a></h3>
117
                                <h3 class="panel-header" id="panel-header-[% pm.borrowernumber | html %]"><a href="#panel_modify_[% pm.borrowernumber | uri %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 %]</a></h3>
118
                                <div id="panel_modify_[% pm.borrowernumber | html %]">
118
                                <div id="panel_modify_[% pm.borrowernumber | html %]">
119
                                    <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
119
                                    <div class="btn-toolbar">
120
                                        <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
120
                                        <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
121
                                        <label for="approve_modify_[% pm.borrowernumber | html %]">Approve</label>
121
                                        <label for="approve_modify_[% pm.borrowernumber | html %]">Approve</label>
122
122
Lines 127-132 Link Here
127
                                        <label for="ignore_modify_[% pm.borrowernumber | html %]">Ignore</label>
127
                                        <label for="ignore_modify_[% pm.borrowernumber | html %]">Ignore</label>
128
                                        | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber | html %]" >Patron details</a>
128
                                        | <a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% pm.borrowernumber | html %]" >Patron details</a>
129
                                    </div>
129
                                    </div>
130
131
                                    [% IF borrowers.$borrowernumber.gonenoaddress > 0 %]
132
                                        <div class="dialog message" style="margin-top:.8em">
133
                                            <h4>Patron's address in doubt</h4>
134
                                            <p>The <strong>Gone no address</strong> flag is set for this patron. If this modification request resolves the issue, please unset the flag.</p>
135
                                            <input type="checkbox" id="unset_gna_[% pm.borrowernumber | html %]" name="unset_gna_[% pm.borrowernumber | html %]" value="unset_gna_[% pm.borrowernumber | html %]"/>
136
                                            <label for="unset_gna_[% pm.borrowernumber | html %]">Unset Gone no address for this patron</label>
137
                                        </div>
138
                                    [% END %]
139
130
                                  [% IF !pm.extended_attributes and pm.size > 3 or pm.extended_attributes and pm.size > 4 %]
140
                                  [% IF !pm.extended_attributes and pm.size > 3 or pm.extended_attributes and pm.size > 4 %]
131
                                  [%# timestamp+verification_token+borrowernumber=3 %]
141
                                  [%# timestamp+verification_token+borrowernumber=3 %]
132
                                    <div class="members-update-table">
142
                                    <div class="members-update-table">
Lines 179-197 Link Here
179
                                        </table>
189
                                        </table>
180
                                    </div>
190
                                    </div>
181
                                  [%  END %]
191
                                  [%  END %]
182
                                  [% IF borrowers.$borrowernumber.gonenoaddress > 0 %]
183
                                    <div class="dialog message" style="margin-top:.8em">
184
                                        <h4>Patron's address in doubt</h4>
185
                                        <p>The <strong>Gone no address</strong> flag is set for this patron. If this modification request resolves the issue, please unset the flag.</p>
186
                                        <input type="checkbox" id="unset_gna_[% pm.borrowernumber | html %]" name="unset_gna_[% pm.borrowernumber | html %]" value="unset_gna_[% pm.borrowernumber | html %]"/>
187
                                        <label for="unset_gna_[% pm.borrowernumber | html %]">Unset Gone no address for this patron</label>
188
                                    </div>
189
                                  [% END %]
190
                                </div>
192
                                </div>
191
                            [% END %]
193
                            [% END %]
192
                        </div>
194
                        </div>
193
                    <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
195
                    <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
194
195
                </form>
196
                </form>
196
            [% ELSE %]
197
            [% ELSE %]
197
            <div class="dialog message">
198
            <div class="dialog message">
Lines 207-213 Link Here
207
    [% Asset.js("js/members-menu.js") | $raw %]
208
    [% Asset.js("js/members-menu.js") | $raw %]
208
    <script>
209
    <script>
209
        $(function() {
210
        $(function() {
210
            $( "#pending_updates" ).accordion();
211
            $( "#pending_updates" ).accordion({
212
                collapsible: true,
213
                heightStyle: "content",
214
                [%- IF ( active ) -%]
215
                    active: $(".panel-header").index( $("#panel-header-[% active | html %]") )
216
                [%- ELSE -%]
217
                    active: 0
218
                [%- END -%]
219
            });
211
        });
220
        });
212
    </script>
221
    </script>
213
[% END %]
222
[% END %]
(-)a/members/members-update.pl (-2 / +2 lines)
Lines 71-77 foreach my $pm (@$pending_modifications) { Link Here
71
71
72
$template->param(
72
$template->param(
73
    PendingModifications => $pending_modifications,
73
    PendingModifications => $pending_modifications,
74
    borrowers            => $borrowers
74
    borrowers            => $borrowers,
75
    active               => ( $query->param('active') || 0 ),
75
);
76
);
76
77
77
output_html_with_http_headers $query, $cookie, $template->output;
78
output_html_with_http_headers $query, $cookie, $template->output;
78
- 

Return to bug 28073