Attachment 162715 Details for Bug 36221 – Bug 36221: Preparation

[patch] Bug 36221: Preparation

Bug-36221-Preparation.patch (text/plain), 27.17 KB, created by Pedro Amorim on 2024-03-04 14:27:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro Amorim

Created: 2024-03-04 14:27:20 UTC

Size: 27.17 KB

patch

obsolete

>From 156101430bf7666bc0d33d1d1861b8db54471bb2 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Mon, 4 Mar 2024 14:20:35 +0000
>Subject: [PATCH] Bug 36221: Preparation
>
>This refactors the code for more DRY
>---
> Koha/ILL/Backend/intra-includes/create.inc    |  3 +-
> Koha/ILL/Backend/intra-includes/edititem.inc  |  3 +-
> Koha/ILL/Backend/opac-includes/create.inc     | 18 +++---
> .../shared-includes/form_input_helpers.inc    | 34 +++++++++++
> .../Backend/shared-includes/forms/article.inc | 46 ++------------
> .../Backend/shared-includes/forms/book.inc    | 41 +------------
> .../Backend/shared-includes/forms/chapter.inc | 56 ++---------------
> .../shared-includes/forms/conference.inc      | 55 ++++-------------
> .../Backend/shared-includes/forms/journal.inc | 26 +-------
> .../shared-includes/forms/resource.inc        | 60 ++++---------------
> .../Backend/shared-includes/forms/thesis.inc  | 25 ++------
> 11 files changed, 88 insertions(+), 279 deletions(-)
> create mode 100644 Koha/ILL/Backend/shared-includes/form_input_helpers.inc
>
>diff --git a/Koha/ILL/Backend/intra-includes/create.inc b/Koha/ILL/Backend/intra-includes/create.inc
>index e16bfb31aba..5be46029dda 100644
>--- a/Koha/ILL/Backend/intra-includes/create.inc
>+++ b/Koha/ILL/Backend/intra-includes/create.inc
>@@ -1,4 +1,6 @@
> [% SET koha_version = Koha.Version %]
>+[% cwd = whole.cwd %]
>+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
> [% IF whole.error %]
> [% IF whole.status == 'missing_identifier' %]
> <p><em>Please Note:</em> Mandatory field Identifier is missing.</p>
>@@ -72,7 +74,6 @@
>       </li>
>     </ol>
>   </fieldset>
>-  [% cwd = whole.cwd %]
>   [% type = whole.value.other.type %]
>   [% IF type %]
>       [% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
>diff --git a/Koha/ILL/Backend/intra-includes/edititem.inc b/Koha/ILL/Backend/intra-includes/edititem.inc
>index 58dfb4bcaed..adab7e50ce7 100644
>--- a/Koha/ILL/Backend/intra-includes/edititem.inc
>+++ b/Koha/ILL/Backend/intra-includes/edititem.inc
>@@ -1,3 +1,5 @@
>+[% cwd = whole.cwd %]
>+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
> [% IF whole.error %]
> [% IF whole.status == 'missing_type' %]
> <p><em>Please Note:</em> Mandatory field Type is missing.</p>
>@@ -65,7 +67,6 @@
>         </li>
>       </ol>
>     </fieldset>
>-    [% cwd = whole.cwd %]
>     [% type = whole.value.other.type %]
>     [% IF type %]
>         [% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
>diff --git a/Koha/ILL/Backend/opac-includes/create.inc b/Koha/ILL/Backend/opac-includes/create.inc
>index 8b22848d7ea..c4af2bee623 100644
>--- a/Koha/ILL/Backend/opac-includes/create.inc
>+++ b/Koha/ILL/Backend/opac-includes/create.inc
>@@ -1,3 +1,6 @@
>+[% PROCESS 'i18n.inc' %]
>+[% cwd = whole.cwd %]
>+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
> [% IF whole.error %]
> [% IF whole.status == 'missing_identifier' %]
> <p><em>Please Note:</em> Mandatory field Identifier is missing.</p>
>@@ -20,9 +23,8 @@
>   <fieldset class="rows">
>     <legend>General details</legend>
>     <ol id="general-standard-fields">
>+    [% WRAPPER ill_select_field id = 'type' label = t('Type') %]
>       <li>
>-        <label class="required" for="type">Type:</label>
>-        <select name="type" id="type">
>           <option value=""/>
>           [% IF whole.value.other.type.lower == "book" %]
>           <option value="book" selected="selected">Book</option>
>@@ -69,11 +71,10 @@
>           [% ELSE %]
>           <option value="resource">Generic resource</option>
>           [% END %]
>-        </select>
>-      </li>
>+        </li>
>+    [% END #ill_select_field %]
>     </ol>
>   </fieldset>
>-  [% cwd = whole.cwd %]
>   [% type = whole.value.other.type %]
>   [% IF type %]
>       [% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
>@@ -83,8 +84,7 @@
>     <legend>Patron options</legend>
>     <ol>
>       <li>
>-        <label class="required" for="branchcode">Destination library:</label>
>-        <select id="branchcode" name="branchcode">
>+        [% WRAPPER ill_select_field id = 'branchcode' label = t('Destination library') %]
>           <option value="" />
>           [% FOREACH branch IN branches %]
>             [% IF whole.value.other.branchcode && branch.branchcode == whole.value.other.branchcode %]
>@@ -97,7 +97,7 @@
>             </option>
>             [% END %]
>           [% END %]
>-        </select>
>+        [% END #ill_select_field %]
>       </li>
>     </ol>
>   </fieldset>
>@@ -121,4 +121,4 @@
>     [% INCLUDE "${cwd}/shared-includes/shared.js" %]
>     // ]]>
> </script>
>-[% END %]
>+[% END %]
>\ No newline at end of file
>diff --git a/Koha/ILL/Backend/shared-includes/form_input_helpers.inc b/Koha/ILL/Backend/shared-includes/form_input_helpers.inc
>new file mode 100644
>index 00000000000..799dfa6e6d1
>--- /dev/null
>+++ b/Koha/ILL/Backend/shared-includes/form_input_helpers.inc
>@@ -0,0 +1,34 @@
>+[% BLOCK ill_text_input_field %]
>+    <li>
>+      <label for="[% id | html %]">[% label | html %]:</label>
>+      <input type="[% type | html %]" name="[% id | html %]" id="[% id | html%]" value="[% value | html %]" />
>+    </li>
>+[% END %]
>+
>+[% BLOCK ill_select_field %]
>+      <label class="required" for="[% id | html %]">[% label | html %]:</label>
>+      <select name="[% id | html %]" id="[% id | html %]">
>+        [% content | $raw %]
>+      </select>
>+[% END %]
>+
>+[% BLOCK book_text_input_fields %]
>+  [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
>+  [% PROCESS ill_text_input_field id = 'author' label = t('Author') value = whole.value.other.author %]
>+  [% PROCESS ill_text_input_field id = 'editor' label = t('Editor') value = whole.value.other.editor %]
>+  [% PROCESS ill_text_input_field id = 'publisher' label = t('Publisher') value = whole.value.other.publisher %]
>+  [% PROCESS ill_text_input_field id = 'published_place' label = t('Place of publication') value = whole.value.other.published_place %]
>+  [% PROCESS ill_text_input_field id = 'year' label = t('Year') value = whole.value.other.year %]
>+  [% PROCESS ill_text_input_field id = 'part_edition' label = t('Part / Edition') value = whole.value.other.part_edition %]
>+  [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
>+  [% PROCESS ill_text_input_field id = 'isbn' label = t('ISBN') value = whole.value.other.isbn %]
>+  [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
>+[% END %]
>+
>+[% BLOCK journal_text_input_fields %]
>+  [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
>+  [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
>+  [% PROCESS ill_text_input_field id = 'issue' label = t('Issue number') value = whole.value.other.issue %]
>+  [% PROCESS ill_text_input_field id = 'year' label = t('Year') value = whole.value.other.issue %]
>+  [% PROCESS ill_text_input_field id = 'issn' label = t('ISSN') value = whole.value.other.issn %]
>+[% END %]
>\ No newline at end of file
>diff --git a/Koha/ILL/Backend/shared-includes/forms/article.inc b/Koha/ILL/Backend/shared-includes/forms/article.inc
>index ad4b4c693e8..07a52d3eaed 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/article.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/article.inc
>@@ -1,50 +1,16 @@
> <fieldset id="journal-standard-fieldset" class="rows">
>     <legend>Journal details</legend>
>     <ol id="journal-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="issue">Issue number:</label>
>-            <input type="text" name="issue" id="issue" value="[% whole.value.other.issue | html %]" />
>-        </li>
>-        <li>
>-            <label for="year">Year:</label>
>-            <input type="text" name="year" id="year" value="[% whole.value.other.year | html %]" />
>-        </li>
>-        <li>
>-            <label for="issn">ISSN:</label>
>-            <input type="text" name="issn" id="issn" value="[% whole.value.other.issn | html %]" />
>-        </li>
>+        [% PROCESS journal_text_input_fields %]
>     </ol>
> </fieldset>
> <fieldset id="article-standard-fieldset" class="rows">
>     <legend>Article details</legend>
>     <ol id="article-standard-fields">
>-        <li>
>-            <label for="article_title">Article title:</label>
>-            <input type="text" name="article_title" id="article_title" value="[% whole.value.other.article_title | html %]" />
>-        </li>
>-        <li>
>-            <label for="article_author">Article author:</label>
>-            <input type="text" name="article_author" id="article_author" value="[% whole.value.other.article_author | html %]" />
>-        </li>
>-        <li>
>-            <label for="published_date">Publication date:</label>
>-            <input type="text" name="published_date" id="published_date" value="[% whole.value.other.published_date | html %]" />
>-        </li>
>-        <li>
>-            <label for="pages">Pages:</label>
>-            <input type="text" name="pages" id="pages" value="[% whole.value.other.pages | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS ill_text_input_field id = 'article_title' label = t('Article title') value = whole.value.other.article_title %]
>+        [% PROCESS ill_text_input_field id = 'article_author' label = t('Article author') value = whole.value.other.article_author %]
>+        [% PROCESS ill_text_input_field id = 'published_date' label = t('Publication date') value = whole.value.other.published_date %]
>+        [% PROCESS ill_text_input_field id = 'pages' label = t('Pages') value = whole.value.other.pages %]
>+        [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/book.inc b/Koha/ILL/Backend/shared-includes/forms/book.inc
>index 397477d18f9..0f84f669011 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/book.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/book.inc
>@@ -1,45 +1,6 @@
> <fieldset id="book-standard-fieldset" class="rows">
>     <legend>Book details</legend>
>     <ol id="publication-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="author">Author:</label>
>-            <input type="text" name="author" id="author" value="[% whole.value.other.author | html %]" />
>-        </li>
>-        <li>
>-            <label for="editor">Editor:</label>
>-            <input type="text" name="editor" id="editor" value="[% whole.value.other.editor | html %]" />
>-        </li>
>-        <li>
>-            <label for="publisher">Publisher:</label>
>-            <input type="text" name="publisher" id="publisher" value="[% whole.value.other.publisher | html %]" />
>-        </li>
>-        <li>
>-            <label for="published_place">Place of publication:</label>
>-            <input type="text" name="published_place" id="published_place" value="[% whole.value.other.published_place | html %]" />
>-        </li>
>-        <li>
>-            <label for="year">Year:</label>
>-            <input type="text" name="year" id="year" value="[% whole.value.other.year | html %]" />
>-        </li>
>-        <li>
>-            <label for="part_edition">Part / Edition:</label>
>-            <input type="text" name="part_edition" id="part_edition" value="[% whole.value.other.part_edition | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="isbn">ISBN:</label>
>-            <input type="text" name="isbn" id="isbn" value="[% whole.value.other.isbn | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS book_text_input_fields %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/chapter.inc b/Koha/ILL/Backend/shared-includes/forms/chapter.inc
>index aafec86f15e..48312571931 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/chapter.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/chapter.inc
>@@ -1,62 +1,14 @@
> <fieldset id="book-standard-fieldset" class="rows">
>     <legend>Book details</legend>
>     <ol id="publication-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="author">Author:</label>
>-            <input type="text" name="author" id="author" value="[% whole.value.other.author | html %]" />
>-        </li>
>-        <li>
>-            <label for="editor">Editor:</label>
>-            <input type="text" name="editor" id="editor" value="[% whole.value.other.editor | html %]" />
>-        </li>
>-        <li>
>-            <label for="publisher">Publisher:</label>
>-            <input type="text" name="publisher" id="publisher" value="[% whole.value.other.publisher | html %]" />
>-        </li>
>-        <li>
>-            <label for="published_place">Place of publication:</label>
>-            <input type="text" name="published_place" id="published_place" value="[% whole.value.other.published_place | html %]" />
>-        </li>
>-        <li>
>-            <label for="year">Year:</label>
>-            <input type="text" name="year" id="year" value="[% whole.value.other.year | html %]" />
>-        </li>
>-        <li>
>-            <label for="part_edition">Part / Edition:</label>
>-            <input type="text" name="part_edition" id="part_edition" value="[% whole.value.other.part_edition | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="isbn">ISBN:</label>
>-            <input type="text" name="isbn" id="isbn" value="[% whole.value.other.isbn | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS book_text_input_fields %]
>     </ol>
> </fieldset>
> <fieldset id="chapter-standard-fieldset" class="rows">
>     <legend>Chapter details</legend>
>     <ol id="chapter-standard-fields">
>-        <li>
>-            <label for="chapter_author">Author:</label>
>-            <input type="text" name="chapter_author" id="chapter_author" value="[% whole.value.other.chapter_author | html %]" />
>-        </li>
>-        <li>
>-            <label for="chapter">Chapter:</label>
>-            <input type="text" name="chapter" id="chapter" value="[% whole.value.other.chapter | html %]" />
>-        </li>
>-        <li>
>-            <label for="pages">Pages:</label>
>-            <input type="text" name="pages" id="pages" value="[% whole.value.other.pages | html %]" />
>-        </li>
>+        [% PROCESS ill_text_input_field id = 'chapter_author' label = t('Author') value = whole.value.other.chapter_author %]
>+        [% PROCESS ill_text_input_field id = 'chapter' label = t('Chapter') value = whole.value.other.chapter %]
>+        [% PROCESS ill_text_input_field id = 'pages' label = t('Pages') value = whole.value.other.pages %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/conference.inc b/Koha/ILL/Backend/shared-includes/forms/conference.inc
>index ca95d5ce6ca..ce74a27e59a 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/conference.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/conference.inc
>@@ -1,49 +1,16 @@
> <fieldset id="conference-standard-fieldset" class="rows">
>     <legend>Conference details</legend>
>     <ol id="conference-standard-fields">
>-        <li>
>-            <label for="title">Conference title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="publication">Publication:</label>
>-            <input type="text" name="publication" id="publication" value="[% whole.value.other.publication | html %]" />
>-        </li>
>-        <li>
>-            <label for="conference_date">Conference date:</label>
>-            <input type="text" name="conference_date" id="conference_date" value="[% whole.value.other.conference_date | html %]" />
>-        </li>
>-        <li>
>-            <label for="venue">Venue:</label>
>-            <input type="text" name="venue" id="venue" value="[% whole.value.other.venue | html %]" />
>-        </li>
>-        <li>
>-            <label for="sponsor">Sponsor:</label>
>-            <input type="text" name="sponsor" id="sponsor" value="[% whole.value.other.sponsor | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="isbn">ISBN:</label>
>-            <input type="text" name="isbn" id="isbn" value="[% whole.value.other.isbn | html %]" />
>-        </li>
>-        <li>
>-            <label for="issn">ISSN:</label>
>-            <input type="text" name="issn" id="issn" value="[% whole.value.other.issn | html %]" />
>-        </li>
>-        <li>
>-            <label for="part_edition">Part:</label>
>-            <input type="text" name="part_edition" id="part_edition" value="[% whole.value.other.part_edition | html %]" />
>-        </li>
>-        <li>
>-            <label for="paper_title">Paper title:</label>
>-            <input type="text" name="paper_title" id="paper_title" value="[% whole.value.other.paper_title | html %]" />
>-        </li>
>-        <li>
>-            <label for="paper_author">Paper author:</label>
>-            <input type="text" name="paper_author" id="paper_author" value="[% whole.value.other.paper_author | html %]" />
>-        </li>
>+        [% PROCESS ill_text_input_field id = 'title' label = t('Conference title') value = whole.value.other.title %]
>+        [% PROCESS ill_text_input_field id = 'publication' label = t('Publication') value = whole.value.other.publication %]
>+        [% PROCESS ill_text_input_field id = 'conference_date' label = t('Conference date') value = whole.value.other.conference_date %]
>+        [% PROCESS ill_text_input_field id = 'venue' label = t('Venue') value = whole.value.other.venue %]
>+        [% PROCESS ill_text_input_field id = 'sponsor' label = t('Sponsor') value = whole.value.other.sponsor %]
>+        [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
>+        [% PROCESS ill_text_input_field id = 'isbn' label = t('ISBN') value = whole.value.other.isbn %]
>+        [% PROCESS ill_text_input_field id = 'issn' label = t('ISSN') value = whole.value.other.issn %]
>+        [% PROCESS ill_text_input_field id = 'part_edition' label = t('Part') value = whole.value.other.part_edition %]
>+        [% PROCESS ill_text_input_field id = 'paper_title' label = t('Paper title') value = whole.value.other.paper_title %]
>+        [% PROCESS ill_text_input_field id = 'paper_author' label = t('Paper author') value = whole.value.other.paper_author %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/journal.inc b/Koha/ILL/Backend/shared-includes/forms/journal.inc
>index 5b94b93a3f9..80b05ddfd81 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/journal.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/journal.inc
>@@ -1,29 +1,7 @@
> <fieldset id="journal-standard-fieldset" class="rows">
>     <legend>Journal details</legend>
>     <ol id="journal-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="issue">Issue number:</label>
>-            <input type="text" name="issue" id="issue" value="[% whole.value.other.issue | html %]" />
>-        </li>
>-        <li>
>-            <label for="year">Year:</label>
>-            <input type="text" name="year" id="year" value="[% whole.value.other.year | html %]" />
>-        </li>
>-        <li>
>-            <label for="issn">ISSN:</label>
>-            <input type="text" name="issn" id="issn" value="[% whole.value.other.issn | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS journal_text_input_fields %]
>+        [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/resource.inc b/Koha/ILL/Backend/shared-includes/forms/resource.inc
>index a475634fe67..b24a76463cb 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/resource.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/resource.inc
>@@ -1,53 +1,17 @@
> <fieldset id="resource-standard-fieldset" class="rows">
>     <legend>Generic resource details</legend>
>     <ol id="resource-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="author">Author:</label>
>-            <input type="text" name="author" id="author" value="[% whole.value.other.author | html %]" />
>-        </li>
>-        <li>
>-            <label for="editor">Editor:</label>
>-            <input type="text" name="editor" id="editor" value="[% whole.value.other.editor | html %]" />
>-        </li>
>-        <li>
>-            <label for="publisher">Publisher:</label>
>-            <input type="text" name="publisher" id="publisher" value="[% whole.value.other.publisher | html %]" />
>-        </li>
>-        <li>
>-            <label for="published_place">Place of publication:</label>
>-            <input type="text" name="published_place" id="published_place" value="[% whole.value.other.published_place | html %]" />
>-        </li>
>-        <li>
>-            <label for="year">Year:</label>
>-            <input type="text" name="year" id="year" value="[% whole.value.other.year | html %]" />
>-        </li>
>-        <li>
>-            <label for="part_edition">Part / Edition:</label>
>-            <input type="text" name="part_edition" id="part_edition" value="[% whole.value.other.part_edition | html %]" />
>-        </li>
>-        <li>
>-            <label for="volume">Volume:</label>
>-            <input type="text" name="volume" id="volume" value="[% whole.value.other.volume | html %]" />
>-        </li>
>-        <li>
>-            <label for="pages">Pages:</label>
>-            <input type="text" name="pages" id="pages" value="[% whole.value.other.pages | html %]" />
>-        </li>
>-        <li>
>-            <label for="isbn">ISBN:</label>
>-            <input type="text" name="isbn" id="isbn" value="[% whole.value.other.isbn | html %]" />
>-        </li>
>-        <li>
>-            <label for "issn">ISSN:</label>
>-            <input type="text" name="issn" id="issn" value="[% whole.value.other.issn | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
>+        [% PROCESS ill_text_input_field id = 'author' label = t('Author') value = whole.value.other.author %]
>+        [% PROCESS ill_text_input_field id = 'editor' label = t('Editor') value = whole.value.other.editor %]
>+        [% PROCESS ill_text_input_field id = 'publisher' label = t('Publisher') value = whole.value.other.publisher %]
>+        [% PROCESS ill_text_input_field id = 'published_place' label = t('Place of publication') value = whole.value.other.published_place %]
>+        [% PROCESS ill_text_input_field id = 'year' label = t('Year') value = whole.value.other.year %]
>+        [% PROCESS ill_text_input_field id = 'part_edition' label = t('Part / Edition') value = whole.value.other.part_edition %]
>+        [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
>+        [% PROCESS ill_text_input_field id = 'pages' label = t('Pages') value = whole.value.other.pages %]
>+        [% PROCESS ill_text_input_field id = 'isbn' label = t('ISBN') value = whole.value.other.isbn %]
>+        [% PROCESS ill_text_input_field id = 'issn' label = t('ISSN') value = whole.value.other.issn %]
>+        [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
>     </ol>
> </fieldset>
>diff --git a/Koha/ILL/Backend/shared-includes/forms/thesis.inc b/Koha/ILL/Backend/shared-includes/forms/thesis.inc
>index a170d665561..af99af03de8 100644
>--- a/Koha/ILL/Backend/shared-includes/forms/thesis.inc
>+++ b/Koha/ILL/Backend/shared-includes/forms/thesis.inc
>@@ -1,25 +1,10 @@
> <fieldset id="thesis-standard-fieldset" class="rows">
>     <legend>Thesis details</legend>
>     <ol id="thesis-standard-fields">
>-        <li>
>-            <label for="title">Title:</label>
>-            <input type="text" name="title" id="title" value="[% whole.value.other.title | html %]" />
>-        </li>
>-        <li>
>-            <label for="author">Author:</label>
>-            <input type="text" name="author" id="author" value="[% whole.value.other.author | html %]" />
>-        </li>
>-        <li>
>-            <label for="institution">Institution:</label>
>-            <input type="text" name="institution" id="institution" value="[% whole.value.other.institution | html %]" />
>-        </li>
>-        <li>
>-            <label for="published_date">Publication date:</label>
>-            <input type="text" name="published_date" id="published_date" value="[% whole.value.other.published_date | html %]" />
>-        </li>
>-        <li>
>-            <label for="doi">DOI:</label>
>-            <input type="text" name="doi" id="doi" value="[% whole.value.other.doi | html %]" />
>-        </li>
>+        [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
>+        [% PROCESS ill_text_input_field id = 'author' label = t('Author') value = whole.value.other.author %]
>+        [% PROCESS ill_text_input_field id = 'institution' label = t('Institution') value = whole.value.other.institution %]
>+        [% PROCESS ill_text_input_field id = 'published_date' label = t('Publication date') value = whole.value.other.published_date %]
>+        [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
>     </ol>
> </fieldset>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 36221: 162715 | 162716 | 162933 | 162934 | 162948 | 162949 | 162970 | 162971 | 165462 | 165463 | 165464 | 165465 | 173706 | 173752 | 173753 | 173754 | 173755 | 173756 | 173939 | 173940 | 173941 | 173965 | 173969 | 174017 | 174018 | 174019 | 174020 | 174021 | 174022 | 174023 | 174024 | 174025 | 174026 | 174027 | 174385 | 174398 | 174454