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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc (-4 / +4 lines)
Lines 23-40 Link Here
23
  <li>
23
  <li>
24
    <label class="required" for="tagfield">MARC field: </label>
24
    <label class="required" for="tagfield">MARC field: </label>
25
    [% IF field && field.tagfield == tagfield %]
25
    [% IF field && field.tagfield == tagfield %]
26
        <input type="text" id="tagfield" name="tagfield" maxlength="3" size="3" class="required" required="required" value="[% tagfield | html %]" />
26
        <input type="text" id="tagfield" name="tagfield" maxlength="3" size="3" class="required" pattern="[a-zA-Z0-9]+" required="required" value="[% tagfield | html %]" />
27
    [% ELSE %]
27
    [% ELSE %]
28
        <input type="text" id="tagfield" name="tagfield" maxlenght="3" size="3" class="required" required="required" />
28
        <input type="text" id="tagfield" name="tagfield" maxlenght="3" size="3" class="required" pattern="[a-zA-Z0-9]+" required="required" />
29
    [% END %]
29
    [% END %]
30
    <span class="required">Required</span>
30
    <span class="required">Required</span>
31
  </li>
31
  </li>
32
  <li>
32
  <li>
33
    <label for="tagsubfield">MARC subfield: </label>
33
    <label for="tagsubfield">MARC subfield: </label>
34
    [% IF field && field.tagsubfield == tagsubfield %]
34
    [% IF field && field.tagsubfield == tagsubfield %]
35
        <input type="text" id="tagsubfield" name="tagsubfield" maxlength="1" size="1" value="[% tagsubfield | html %]" />
35
        <input type="text" id="tagsubfield" name="tagsubfield" pattern="[a-zA-Z0-9]+" maxlength="1" size="1" value="[% tagsubfield | html %]" />
36
    [% ELSE %]
36
    [% ELSE %]
37
        <input type="text" id="tagsubfield" name="tagsubfield" maxlength="1" size="1" />
37
        <input type="text" id="tagsubfield" name="tagsubfield" pattern="[a-zA-Z0-9]+" maxlength="1" size="1" />
38
    [% END %]
38
    [% END %]
39
  </li>
39
  </li>
40
  <li>
40
  <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt (-1 / +2 lines)
Lines 23-29 Link Here
23
23
24
          <h1>Item search field: [% field.label | html %]</h1>
24
          <h1>Item search field: [% field.label | html %]</h1>
25
25
26
          <form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" class="validated">
26
          <form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" id="edit_search_fields">
27
            <fieldset class="rows">
27
            <fieldset class="rows">
28
              <legend>Edit field</legend>
28
              <legend>Edit field</legend>
29
              [% INCLUDE 'admin-items-search-field-form.inc' field=field %]
29
              [% INCLUDE 'admin-items-search-field-form.inc' field=field %]
Lines 49-54 Link Here
49
49
50
[% MACRO jsinclude BLOCK %]
50
[% MACRO jsinclude BLOCK %]
51
    [% Asset.js("js/admin-menu.js") | $raw %]
51
    [% Asset.js("js/admin-menu.js") | $raw %]
52
    [% Asset.js("js/item_search_fields.js") | $raw %]
52
[% END %]
53
[% END %]
53
54
54
[% INCLUDE 'intranet-bottom.inc' %]
55
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt (-2 / +2 lines)
Lines 91-97 Link Here
91
              </div>
91
              </div>
92
          [% END %]
92
          [% END %]
93
93
94
          <form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST" class="validated">
94
          <form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST">
95
            <fieldset class="rows">
95
            <fieldset class="rows">
96
              <legend>Add a new field</legend>
96
              <legend>Add a new field</legend>
97
              [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
97
              [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
Lines 99-105 Link Here
99
            </fieldset>
99
            </fieldset>
100
            <fieldset class="action">
100
            <fieldset class="action">
101
              <input type="submit" value="Submit" />
101
              <input type="submit" value="Submit" />
102
              <a href="#" class="cancel">Cancel</a>
102
              <a href="#" class="cancel hide_form">Cancel</a>
103
            </fieldset>
103
            </fieldset>
104
          </form>
104
          </form>
105
105
(-)a/koha-tmpl/intranet-tmpl/prog/js/item_search_fields.js (-3 / +35 lines)
Lines 1-3 Link Here
1
/* global _ MSG_ITEM_SEARCH_DELETE_CONFIRM */
2
3
jQuery.validator.addMethod("marcfield", function(value, element) {
4
    return this.optional(element) || /^[0-9a-zA-Z]+$/.test(value);
5
}, _("Please enter letters or numbers") );
6
1
$(document).ready(function(){
7
$(document).ready(function(){
2
    $("#add_field_form").hide();
8
    $("#add_field_form").hide();
3
    $("#new_search_field").on("click",function(e){
9
    $("#new_search_field").on("click",function(e){
Lines 6-12 $(document).ready(function(){ Link Here
6
        $(".dialog").hide();
12
        $(".dialog").hide();
7
        $("#search_fields_list,#toolbar").hide();
13
        $("#search_fields_list,#toolbar").hide();
8
    });
14
    });
9
    $(".cancel").on("click",function(e){
15
    $(".hide_form").on("click",function(e){
10
        e.preventDefault();
16
        e.preventDefault();
11
        $("#add_field_form").hide();
17
        $("#add_field_form").hide();
12
        $(".dialog").show();
18
        $(".dialog").show();
Lines 21-24 $(document).ready(function(){ Link Here
21
            return false;
27
            return false;
22
        }
28
        }
23
    });
29
    });
24
});
30
31
    $("#add_field_form").validate({
32
        rules: {
33
            label: "required",
34
            tagfield: {
35
                required: true,
36
                marcfield: true
37
            },
38
            tagsubfield: {
39
                marcfield: true
40
            }
41
        }
42
    });
43
44
    $("#edit_search_fields").validate({
45
        rules: {
46
            label: "required",
47
            tagfield: {
48
                required: true,
49
                marcfield: true
50
            },
51
            tagsubfield: {
52
                marcfield: true
53
            }
54
        }
55
    });
56
57
});
25
- 

Return to bug 20689