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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt (-55 / +58 lines)
Lines 64-135 Link Here
64
        <div id="yui-main">
64
        <div id="yui-main">
65
            <div class="yui-b">
65
            <div class="yui-b">
66
                <div class="yui-g">
66
                <div class="yui-g">
67
                    [% IF PendingModifications %]
68
                        <form method="post" action="members-update-do.pl">
67
69
68
                    <form method="post" action="members-update-do.pl">
70
                            <table>
69
71
                                <thead>
70
                        <table>
72
                                    <tr>
71
                            <thead>
73
                                        <th colspan="3">Action</th>
72
                                <tr>
74
                                        <th rowspan="2">Patron</th>
73
                                    <th colspan="3">Action</th>
75
                                        <th rowspan="2">Changes</th>
74
                                    <th rowspan="2">Patron</th>
76
                                    </tr>
75
                                    <th rowspan="2">Changes</th>
76
                                </tr>
77
78
                                <tr>
79
                                    <th>Approve</th>
80
                                    <th>Deny</th>
81
                                    <th>Ignore</th>
82
                                </tr>
83
                            </thead>
84
77
85
                            <tbody>
86
                                [% FOREACH pm IN PendingModifications %]
87
                                    [% SET borrowernumber = pm.borrowernumber %]
88
                                    <tr>
78
                                    <tr>
89
                                        <td>
79
                                        <th>Approve</th>
90
                                            <input type="radio" name="modify_[% pm.borrowernumber %]" value="approve" />
80
                                        <th>Deny</th>
91
                                        </td>
81
                                        <th>Ignore</th>
92
                                        <td>
82
                                    </tr>
93
                                            <input type="radio" name="modify_[% pm.borrowernumber %]" value="deny" />
83
                                </thead>
94
                                        </td>
84
95
                                        <td>
85
                                <tbody>
96
                                            <input type="radio" name="modify_[% pm.borrowernumber %]" value="ignore" checked="checked"/>
86
                                    [% FOREACH pm IN PendingModifications %]
97
                                        </td>
87
                                        [% SET borrowernumber = pm.borrowernumber %]
88
                                        <tr>
89
                                            <td>
90
                                                <input type="radio" name="modify_[% pm.borrowernumber %]" value="approve" />
91
                                            </td>
92
                                            <td>
93
                                                <input type="radio" name="modify_[% pm.borrowernumber %]" value="deny" />
94
                                            </td>
95
                                            <td>
96
                                                <input type="radio" name="modify_[% pm.borrowernumber %]" value="ignore" checked="checked"/>
97
                                            </td>
98
98
99
                                        <td>
99
                                            <td>
100
                                            [% borrowers.$borrowernumber.firstname %] [% borrowers.$borrowernumber.surname %]
100
                                                [% borrowers.$borrowernumber.firstname %] [% borrowers.$borrowernumber.surname %]
101
                                        </td>
101
                                            </td>
102
102
103
                                        <td>
103
                                            <td>
104
                                            <table>
104
                                                <table>
105
                                                <tr>
105
                                                    <tr>
106
                                                    <th>Field</th>
106
                                                        <th>Field</th>
107
                                                    <th>From</th>
107
                                                        <th>From</th>
108
                                                    <th>To</th>
108
                                                        <th>To</th>
109
                                                </tr>
109
                                                    </tr>
110
110
111
111
112
                                                [% FOREACH key IN pm.keys %]
112
                                                    [% FOREACH key IN pm.keys %]
113
                                                    [% IF field_display_names.$key %]
113
                                                        [% IF field_display_names.$key %]
114
                                                        [% IF ( ( pm.$key OR borrowers.$borrowernumber.$key ) && ( pm.$key != borrowers.$borrowernumber.$key ) ) %]
114
                                                            [% IF ( ( pm.$key OR borrowers.$borrowernumber.$key ) && ( pm.$key != borrowers.$borrowernumber.$key ) ) %]
115
                                                            <tr>
115
                                                                <tr>
116
                                                                <td>[% field_display_names.$key %]</td>
116
                                                                    <td>[% field_display_names.$key %]</td>
117
                                                                <td>[% borrowers.$borrowernumber.$key %]</td>
117
                                                                    <td>[% borrowers.$borrowernumber.$key %]</td>
118
                                                                <td>[% pm.$key %]</td>
118
                                                                    <td>[% pm.$key %]</td>
119
                                                            </td>
119
                                                                </td>
120
                                                            [% END %]
120
                                                        [% END %]
121
                                                        [% END %]
121
                                                    [% END %]
122
                                                    [% END %]
122
                                                [% END %]
123
                                                </table>
123
                                            </table>
124
                                            </td>
124
                                        </td>
125
                                        </tr>
125
                                    </tr>
126
                                    [% END %]
126
                                [% END %]
127
                                </tbody>
127
                            </tbody>
128
                            </table>
128
                        </table>
129
129
130
                        <p><input type="submit" /></p>
130
                            <p><input type="submit" /></p>
131
131
132
                    </form>
132
                        </form>
133
                    [% ELSE %]
134
                        <p>There are no pending patron modifications.</p>
135
                    [% END %]
133
                </div>
136
                </div>
134
            </div>
137
            </div>
135
        </div>
138
        </div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt (-5 / +21 lines)
Lines 7-13 Link Here
7
7
8
    <script type="text/javascript">
8
    <script type="text/javascript">
9
        $(document).ready(function() {
9
        $(document).ready(function() {
10
            $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
10
            [% IF OPACPatronDetails %]
11
                $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
12
            [% ELSE %]
13
                $("#memberentry-form :input").attr('readonly', true);
14
                $("#borrower_branchcode").attr('disabled',true);
15
                $("#borrower_title").attr('disabled',true);
16
                $('#memberentry-form :radio').attr('disabled',true);
17
                $('span.required').remove();
18
                $('label.required').removeClass('required');
19
            [% END %]
11
        });
20
        });
12
    </script>
21
    </script>
13
</head>
22
</head>
Lines 21-26 Link Here
21
                <div class="yui-b">
30
                <div class="yui-b">
22
                    <div class="yui-g">
31
                    <div class="yui-g">
23
                        <div id="useraccount" class="container">
32
                        <div id="useraccount" class="container">
33
                            [% UNLESS OPACPatronDetails %]
34
                                <div>To make changes to your record please contact the library.</div>
35
                            [% END %]
24
36
25
                            [% IF empty_mandatory_fields %]
37
                            [% IF empty_mandatory_fields %]
26
                                <div class="dialog alert">You have not filled out all required fields. Please fill in all missing fields and resubmit.</div>
38
                                <div class="dialog alert">You have not filled out all required fields. Please fill in all missing fields and resubmit.</div>
Lines 30-36 Link Here
30
                                <div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
42
                                <div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
31
                            [% END %]
43
                            [% END %]
32
44
33
                            <form method="post">
45
                            <form method="post" id="memberentry-form">
34
46
35
                                [% UNLESS
47
                                [% UNLESS
36
                                    hidden.defined('branchcode')
48
                                    hidden.defined('branchcode')
Lines 134-140 Link Here
134
146
135
                                                    <input type="text" id="borrower_dateofbirth" name="borrower_dateofbirth" value="[% borrower.dateofbirth | $KohaDates %]" readonly="readonly" size="10" />
147
                                                    <input type="text" id="borrower_dateofbirth" name="borrower_dateofbirth" value="[% borrower.dateofbirth | $KohaDates %]" readonly="readonly" size="10" />
136
148
137
                                                    <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('borrower_dateofbirth').value='';return false;">Clear date</a><p></p>
149
                                                    [% IF OPACPatronDetails %]
150
                                                        <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('borrower_dateofbirth').value='';return false;">Clear date</a><p></p>
151
                                                    [% END %]
138
152
139
                                                    [% IF mandatory.defined('dateofbirth') %]<span class="required">Required</span>[% END %]
153
                                                    [% IF mandatory.defined('dateofbirth') %]<span class="required">Required</span>[% END %]
140
                                                </li>
154
                                                </li>
Lines 690-697 Link Here
690
                                [% END %]
704
                                [% END %]
691
705
692
                                [% IF action == 'edit' %]
706
                                [% IF action == 'edit' %]
693
                                    <input type="hidden" name="action" value="update" />
707
                                    [% IF OPACPatronDetails %]
694
                                    <input type="submit" value="Submit Update Request" />
708
                                        <input type="hidden" name="action" value="update" />
709
                                        <input type="submit" value="Submit Update Request" />
710
                                    [% END %]
695
                                [% ELSE %]
711
                                [% ELSE %]
696
                                    <input type="hidden" name="action" value="create" />
712
                                    <input type="hidden" name="action" value="create" />
697
                                    <input type="submit" value="Submit" />
713
                                    <input type="submit" value="Submit" />
(-)a/members/members-update-do.pl (-1 / +1 lines)
Lines 61-64 foreach my $param (@params) { Link Here
61
    }
61
    }
62
}
62
}
63
63
64
print $query->redirect("/cgi-bin/koha/mainpage.pl");
64
print $query->redirect("/cgi-bin/koha/members/members-update.pl");
(-)a/opac/opac-memberentry.pl (-11 / +12 lines)
Lines 30-40 use C4::Branch qw(GetBranchesLoop); Link Here
30
my $cgi = new CGI;
30
my $cgi = new CGI;
31
my $dbh = C4::Context->dbh;
31
my $dbh = C4::Context->dbh;
32
32
33
unless ( C4::Context->preference('PatronSelfRegistration') ) {
34
    print $cgi->redirect("/cgi-bin/koha/opac-main.pl");
35
    exit;
36
}
37
38
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
33
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
39
    {
34
    {
40
        template_name   => "opac-memberentry.tmpl",
35
        template_name   => "opac-memberentry.tmpl",
Lines 44-54 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
44
    }
39
    }
45
);
40
);
46
41
42
unless ( C4::Context->preference('PatronSelfRegistration') || $borrowernumber ) {
43
    print $cgi->redirect("/cgi-bin/koha/opac-main.pl");
44
    exit;
45
}
46
47
$template->param(
47
$template->param(
48
    hidden        => GetHiddenFields(),
48
    hidden            => GetHiddenFields(),
49
    mandatory     => GetMandatoryFields(),
49
    mandatory         => GetMandatoryFields(),
50
    member_titles => GetTitles(),
50
    member_titles     => GetTitles(),
51
    branches      => GetBranchesLoop()
51
    branches          => GetBranchesLoop(),
52
    OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
52
);
53
);
53
54
54
my $action = $cgi->param('action') || q{};
55
my $action = $cgi->param('action') || q{};
Lines 167-173 elsif ($borrowernumber) { #Display logged in borrower's data Link Here
167
    $action = 'edit';
168
    $action = 'edit';
168
169
169
    $template->param(
170
    $template->param(
170
        borrower => GetMember( borrowernumber => $borrowernumber ) );
171
        borrower => GetMember( borrowernumber => $borrowernumber ),
172
    );
171
}
173
}
172
174
173
my $captcha = random_string("CCCCC");
175
my $captcha = random_string("CCCCC");
174
- 

Return to bug 7067