From 48008b92c47685c03ef7c10ee038663ad58cad6a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 22 Aug 2020 11:15:28 +0200 Subject: [PATCH] Bug 25728: fix rebase issues --- .../prog/en/modules/cataloguing/additem.tt | 8 +- koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 78 +++++++++++-------- 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index e05b55f2ef..9e506c72ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -161,13 +161,9 @@ [% ELSIF ( mv.type == 'select' ) %] [% IF ( mv.readonly || ite.IS_RETURN_CLAIM ) %] - [% ELSE %] - [% IF mv.category AND CAN_user_parameters_manage_auth_values %] - - [% END %] +