From c8b9169b5addccf0171bf762fe4567e12e3c799c Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Wed, 1 Feb 2017 09:13:17 +0000
Subject: [PATCH] Bug 17047 - Don't create numberpattern if the same exists

---
 Koha/Subscription/Numberpatterns.pm                | 20 +++++++++
 .../prog/en/modules/serials/subscription-add.tt    |  5 ++-
 serials/subscription-add.pl                        | 52 +++++++++-------------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/Koha/Subscription/Numberpatterns.pm b/Koha/Subscription/Numberpatterns.pm
index 1070f43..638e028 100644
--- a/Koha/Subscription/Numberpatterns.pm
+++ b/Koha/Subscription/Numberpatterns.pm
@@ -32,6 +32,26 @@ Koha::SubscriptionNumberpatterns - Koha SubscriptionNumberpattern object set cla
 
 =cut
 
+=head3 uniqeLabel
+
+=cut
+
+sub uniqueLabel {
+    my ($self, $label) = @_;
+
+    my $samelabel = Koha::Subscription::Numberpatterns->search({label => $label})->next();
+    if ($samelabel) {
+        my $i = 2;
+        my $newlabel = $samelabel->label . " ($i)";
+        while (my $othersamelabel = $self->search({label => $newlabel})->next()) {
+            $i++;
+            $newlabel = $samelabel->label . " ($i)";
+        }
+        $label = $newlabel;
+    }
+    return $label;
+}
+
 =head3 type
 
 =cut
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index bddb7f7..46c732e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -331,7 +331,7 @@ function testPredictionPattern() {
         url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
         data: ajaxData,
         success: function(data) {
-            $("#displayexample").html(data);
+            $("#displayexample").html(data).show();
             patternneedtobetested = 0;
         }
     });
@@ -511,6 +511,7 @@ function removeDisabledAttr() {
 
 
 $(document).ready(function() {
+    $("#displayexample").hide();
     $("#mana_search_result").modal("hide");
     $("#aqbooksellerid").on('keypress', function(e) {
         if (e.keyCode == 13) {
@@ -1134,7 +1135,7 @@ $(document).ready(function() {
 </div>
 
 <div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 90%; left:5%; margin-left: auto; display: none;">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
                 <h3 id="mana_search_result_label"></h3>
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 3457dd0..3284e76 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -287,39 +287,29 @@ sub _guess_enddate {
 }
 
 sub manage_subscription_numbering_pattern_id {
-    my $numberpattern;
+    my $params;
     if ( $query->param('numbering_pattern') eq 'mana' ) {
-        my $subscription_np = Koha::Subscription::Numberpattern->new()->set(
-            {
-                label           => $query->param('patternname'),
-                description     => $query->param('sndescription'),
-                numberingmethod => $query->param('numberingmethod'),
-                label1          => $query->param('label1'),
-                add1            => $query->param('add1'),
-                every1          => $query->param('every1'),
-                whenmorethan1   => $query->param('whenmorethan1'),
-                setto1          => $query->param('setto1'),
-                numbering1      => $query->param('numbering1'),
-                label2          => $query->param('label2'),
-                add2            => $query->param('add2'),
-                every2          => $query->param('every2'),
-                whenmorethan2   => $query->param('whenmorethan2'),
-                setto2          => $query->param('setto2'),
-                numbering2      => $query->param('numbering2'),
-                label3          => $query->param('label3'),
-                add3            => $query->param('add3'),
-                every3          => $query->param('every3'),
-                whenmorethan3   => $query->param('whenmorethan3'),
-                setto3          => $query->param('setto3'),
-                numbering3      => $query->param('numbering3'),
-            }
-        )->store();
-        $numberpattern = $subscription_np->id;
-    }
-    else {
-        $numberpattern = $query->param('numbering_pattern');
+        foreach (qw/numberingmethod label1 add1 every1 whenmorethan1 setto1
+                   numbering1 label2 add2 every2 whenmorethan2 setto2 numbering2
+                   label3 add3 every3 whenmorethan3 setto3 numbering3/) {
+            $params->{$_} = $query->param($_) if $query->param($_);
+        }
+
+        my $existing = Koha::Subscription::Numberpatterns->search($params)->next();
+
+        if ($existing) {
+            return $existing->id;
+        }
+
+        $params->{label} = Koha::Subscription::Numberpattern->uniqueLabel($query->param('patternname'));
+        $params->{description} = $query->param('sndescription');
+
+
+        my $subscription_np = Koha::Subscription::Numberpattern->new()->set($params)->store();
+        return $subscription_np->id;
     }
-    return $numberpattern;
+
+    return $query->param('numbering_pattern');
 }
 
 sub manage_subscription_frequencies_id {
-- 
2.7.4