diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc
new file mode 100644
index 0000000000..32cb47be83
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/manageable-mixin.inc
@@ -0,0 +1,62 @@
+[% BLOCK select_manager_show %]
+ [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ manager.borrowernumber %]
+ [% IF display == 'fieldset' %]
+
+ Managed by:
+ [% manager.firstname _ " " _ manager.surname _ " [" _ manager.cardnumber _ "]" | html %]
+
+ [% ELSIF display == 'table' %]
+
+ | Managed by: |
+ [% manageddate | $KohaDates %] |
+
+ [% IF ( manager.borrowernumber ) %]
+ [% manager.surname | html %], [% manager.firstname | html %] ([% manager.cardnumber | html %])
+ [% Branches.GetName( manager.branchcode ) | html %] ([% manager.category.description | html %])
+ [% END %]
+ |
+
+ [% ELSE %]
+
+ Error: Unknown display "[% display | html %]".
+ [% END %]
+[% END %]
+
+[% BLOCK select_manager_form %]
+
+
+
+
+ [% IF required_permission %]
+ You
+ [% ELSE %]
+ Nobody
+ [% END %]
+
+ [% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %]
+ | Previously was [% INCLUDE 'patron-title.inc' patron=manager hide_patron_infos_if_needed=1 %] [% Branches.GetName( manager.branchcode ) | html %] ([% manager.category.description | html %])
+ [% END %]
+
+
Select manager
+ [% IF manager.borrowernumber && logged_in_user.borrowernumber != manager.borrowernumber %]
+
Keep existing manager
+ [% END %]
+ [% IF required_permission %]
+
+ [% END %]
+
+
+ [% IF notify_option %]
+
+
+ [% END %]
+
+
+[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc
new file mode 100644
index 0000000000..6a40a310a9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc
@@ -0,0 +1,67 @@
+[% PROCESS 'patron-search.inc' %]
+[% IF add_modal %]
+ [% SET columns = ['cardnumber','name','category','branch','action'] %]
+ [% SET filter = filter %]
+ [% PROCESS patron_search_modal
+ columns => columns,
+ modal_title => t("Select manager"),
+ patron_search_modal_id => 'patron_search_modal_manager',
+ table_id => 'patron_search_modal_manager_table'
+ %]
+ [% PROCESS patron_search_js
+ columns => columns,
+ actions => ["select"],
+ preview_on_name_click => 1,
+ table_id => 'patron_search_modal_manager_table',
+ callback => 'select_manager'
+ %]
+[% END %]
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index ea4b816d80..94cc911e9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -8,6 +8,7 @@
[% USE TablesSettings %]
[% PROCESS 'i18n.inc' %]
[% PROCESS 'patron-search.inc' %]
+[% PROCESS 'manageable-mixin.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
-
- | Managed by: |
- [% suggestion.manageddate | $KohaDates %] |
-
- [% IF ( suggestion.manager.borrowernumber ) %]
- [% suggestion.manager.surname | html %], [% suggestion.manager.firstname | html %] ([% suggestion.manager.cardnumber | html %])
- [% Branches.GetName( suggestion.manager.branchcode ) | html %] ([% suggestion.manager.category.description | html %])
- [% END %]
- |
-
+ [% PROCESS select_manager_show
+ manager => suggestion.manager
+ display => "table"
+ %]
| Accepted on: |
[% suggestion.accepteddate | $KohaDates %] |
@@ -602,42 +595,11 @@
[% INCLUDE 'date-format.inc' %]
-
-
-
-
- [% IF CAN_user_suggestions_suggestions_manage %]
- You
- [% ELSE %]
- Nobody
- [% END %]
-
- [% IF suggestion.manager.borrowernumber && logged_in_user.borrowernumber != suggestion.manager.borrowernumber %]
- | Previously was [% INCLUDE 'patron-title.inc' patron=suggestion.manager hide_patron_infos_if_needed=1 %] [% Branches.GetName( suggestion.manager.branchcode ) | html %]
- ([% suggestion.manager.category.description | html %])
- [% END %]
-
-
Select manager
- [% IF suggestion.manager.borrowernumber && logged_in_user.borrowernumber != suggestion.manager.borrowernumber %]
-
Keep existing manager
- [% END %]
- [% IF CAN_user_suggestions_suggestions_manage %]
-
- [% END %]
-
-
-
-
-
-
-
+ [% PROCESS select_manager_form
+ manager => suggestion.manager
+ notify_option => 1
+ required_permission => CAN_user_suggestions_suggestions_manage
+ %]
@@ -1251,45 +1213,10 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'select_manager.inc'
+ manager => suggestion.manager
+ %]
-
[% END %]