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

(-)a/authorities/auth_finder.pl (-5 / +5 lines)
Lines 160-170 if ( $op eq "do_search" ) { Link Here
160
        from           => $from,
160
        from           => $from,
161
        to             => $to,
161
        to             => $to,
162
        numbers        => \@numbers,
162
        numbers        => \@numbers,
163
        authtypecode   => $authtypecode,
163
        operator_mainstr => ( @operator > 0 && $operator[0] ) ? $operator[0] : '',
164
        value_mainstr  => $query->param('value_mainstr') || "", 
164
        operator_main    => ( @operator > 1 && $operator[1] ) ? $operator[1] : '',
165
        value_main     => $query->param('value_main') || "",
165
        operator_any     => ( @operator > 2 && $operator[2] ) ? $operator[2] : '',
166
        value_any      => $query->param('value_any') || "",
166
        operator_match   => ( @operator > 3 && $operator[3] ) ? $operator[3] : '',
167
        value_match    => $query->param('value_match') || "",
168
    );
167
    );
169
} else {
168
} else {
170
    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
169
    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 183-188 if ( $op eq "do_search" ) { Link Here
183
}
182
}
184
183
185
$template->param(
184
$template->param(
185
    op            => $op,
186
    value_mainstr => $query->param('value_mainstr') || "", 
186
    value_mainstr => $query->param('value_mainstr') || "", 
187
    value_main    => $query->param('value_main') || "",
187
    value_main    => $query->param('value_main') || "",
188
    value_any     => $query->param('value_any') || "",
188
    value_any     => $query->param('value_any') || "",
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc (-4 / +63 lines)
Lines 123-131 function finderjumpfull(page) Link Here
123
                    <input type="hidden" name="and_or" value="and" />
123
                    <input type="hidden" name="and_or" value="and" />
124
                    <input type="hidden" name="excluding" value="" />
124
                    <input type="hidden" name="excluding" value="" />
125
                    <select name="operator" id="mainmainentry">
125
                    <select name="operator" id="mainmainentry">
126
                        [% IF ( operator_mainstr == 'contains' ) %]
127
                        <option value="contains" selected="selected">contains</option>
128
                        [% ELSE %]
126
                        <option value="contains">contains</option>
129
                        <option value="contains">contains</option>
130
                        [% END %]
131
                        [% IF ( operator_mainstr == 'start' ) %]
132
                        <option value="start" selected="selected">starts with</option>
133
                        [% ELSE %]
127
                        <option value="start">starts with</option>
134
                        <option value="start">starts with</option>
135
                        [% END %]
136
                        [% IF ( operator_mainstr == 'is' ) %]
137
                        <option value="is" selected="selected">is exactly</option>
138
                        [% ELSE %]
128
                        <option value="is">is exactly</option>
139
                        <option value="is">is exactly</option>
140
                        [% END %]
129
                    </select>
141
                    </select>
130
                    <input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr |html %]" />
142
                    <input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr |html %]" />
131
                    <div id="yvaluecontainermainmainentry"></div>
143
                    <div id="yvaluecontainermainmainentry"></div>
Lines 137-145 function finderjumpfull(page) Link Here
137
                    <input type="hidden" name="and_or" value="and" />
149
                    <input type="hidden" name="and_or" value="and" />
138
                    <input type="hidden" name="excluding" value="" />
150
                    <input type="hidden" name="excluding" value="" />
139
                    <select name="operator" id="mainentry">
151
                    <select name="operator" id="mainentry">
152
                        [% IF ( operator_main == 'contains' ) %]
153
                        <option value="contains" selected="selected">contains</option>
154
                        [% ELSE %]
140
                        <option value="contains">contains</option>
155
                        <option value="contains">contains</option>
156
                        [% END %]
157
                        [% IF ( operator_main == 'start' ) %]
158
                        <option value="start" selected="selected">starts with</option>
159
                        [% ELSE %]
141
                        <option value="start">starts with</option>
160
                        <option value="start">starts with</option>
161
                        [% END %]
162
                        [% IF ( operator_main == 'is' ) %]
163
                        <option value="is" selected="selected">is exactly</option>
164
                        [% ELSE %]
142
                        <option value="is">is exactly</option>
165
                        <option value="is">is exactly</option>
166
                        [% END %]
143
                    </select>
167
                    </select>
144
                    <input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main |html %]" />
168
                    <input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main |html %]" />
145
                    <div id="yvaluecontainermainentry"></div>
169
                    <div id="yvaluecontainermainentry"></div>
Lines 151-159 function finderjumpfull(page) Link Here
151
                    <input type="hidden" name="and_or" value="and" />
175
                    <input type="hidden" name="and_or" value="and" />
152
                    <input type="hidden" name="excluding" value="" />
176
                    <input type="hidden" name="excluding" value="" />
153
                    <select name="operator" id="marclistanywhere">
177
                    <select name="operator" id="marclistanywhere">
178
                        [% IF ( operator_any == 'contains' ) %]
179
                        <option value="contains" selected="selected">contains</option>
180
                        [% ELSE %]
154
                        <option value="contains">contains</option>
181
                        <option value="contains">contains</option>
182
                        [% END %]
183
                        [% IF ( operator_any == 'start' ) %]
184
                        <option value="start" selected="selected">starts with</option>
185
                        [% ELSE %]
155
                        <option value="start">starts with</option>
186
                        <option value="start">starts with</option>
187
                        [% END %]
188
                        [% IF ( operator_any == 'is' ) %]
189
                        <option value="is" selected="selected">is exactly</option>
190
                        [% ELSE %]
156
                        <option value="is">is exactly</option>
191
                        <option value="is">is exactly</option>
192
                        [% END %]
157
                    </select>
193
                    </select>
158
                    <input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any |html %]" />
194
                    <input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any |html %]" />
159
                    <div id="yvaluecontainermarclist"></div>
195
                    <div id="yvaluecontainermarclist"></div>
Lines 164-181 function finderjumpfull(page) Link Here
164
                    <input type="hidden" name="and_or" value="and" />
200
                    <input type="hidden" name="and_or" value="and" />
165
                    <input type="hidden" name="excluding" value="" />
201
                    <input type="hidden" name="excluding" value="" />
166
                    <select name="operator" id="marclistheading">
202
                    <select name="operator" id="marclistheading">
203
                        [% IF ( operator_match == 'contains' ) %]
204
                        <option value="contains" selected="selected">contains</option>
205
                        [% ELSE %]
167
                        <option value="contains">contains</option>
206
                        <option value="contains">contains</option>
207
                        [% END %]
208
                        [% IF ( operator_match == 'start' ) %]
209
                        <option value="start" selected="selected">starts with</option>
210
                        [% ELSE %]
168
                        <option value="start">starts with</option>
211
                        <option value="start">starts with</option>
212
                        [% END %]
213
                        [% IF ( operator_match == 'is' ) %]
214
                        <option value="is" selected="selected">is exactly</option>
215
                        [% ELSE %]
169
                        <option value="is">is exactly</option>
216
                        <option value="is">is exactly</option>
217
                        [% END %]
170
                    </select>
218
                    </select>
171
                    <input type="text" name="value_match" value="[% value_match |html %]" />
219
                    <input type="text" name="value_match" value="[% value_match |html %]" />
172
                </li>
220
                </li>
173
        <li>
221
        <li>
174
        <label for="orderby">Sort by: </label>
222
        <label for="orderby">Sort by: </label>
175
        <select name="orderby" id="orderby">
223
        <select name="orderby" id="orderby">
176
            <option value="">No order</option>
224
            [% IF ( orderby == 'HeadingAsc' ) %]
177
            <option value="HeadingAsc" selected="selected">Heading ascendant</option>
225
            <option value="HeadingAsc" selected="selected">Heading A-Z</option>
178
            <option value="HeadingDsc">Heading descendant</option>
226
            [% ELSE %]
227
            <option value="HeadingAsc">Heading A-Z</option>
228
            [% END %]
229
            [% IF ( orderby == 'HeadingDsc' ) %]
230
            <option value="HeadingDsc" selected="selected">Heading Z-A</option>
231
            [% ELSE %]
232
            <option value="HeadingDsc">Heading Z-A</option>
233
            [% END %]
234
            [% IF ( orderby == '' && op ) %]
235
            <option value="" selected="selected">None</option>
236
            [% ELSE %]
237
            <option value="">None</option>
238
            [% END %]
179
        </select>
239
        </select>
180
        </li></ol></fieldset>
240
        </li></ol></fieldset>
181
        [% IF source == 'auth' %]
241
        [% IF source == 'auth' %]
182
- 

Return to bug 10808