Attachment 79933 Details for Bug 17047 – Bug 17047 - Move mana JS and put correct subscription id when sharing

[patch] Bug 17047 - Move mana JS and put correct subscription id when sharing

Bug-17047---Move-mana-JS-and-put-correct-subscript.patch (text/plain), 5.65 KB, created by Alex Arnaud on 2018-10-04 08:13:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Arnaud

Created: 2018-10-04 08:13:29 UTC

Size: 5.65 KB

patch

obsolete

>From 080408df8ee717de8764ea3de8a7940603e75b7c Mon Sep 17 00:00:00 2001
>From: Alex Arnaud <alex.arnaud@biblibre.com>
>Date: Thu, 5 Apr 2018 14:16:47 +0000
>Subject: [PATCH] Bug 17047 - Move mana JS and put correct subscription id when
> sharing
>
>Rebased-by: Alex Arnaud <alex.arnaud@biblibre.com> (2018-07-04)
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc  |  2 +-
> .../prog/en/includes/serials-toolbar.inc           | 40 ----------------------
> .../prog/en/modules/serials/subscription-detail.tt |  1 +
> koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js |  2 +-
> .../intranet-tmpl/prog/js/subscription-add.js      |  2 +-
> serials/subscription-detail.pl                     |  4 +--
> 6 files changed, 6 insertions(+), 45 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc
>index d57290c..04e4181 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc
>@@ -41,4 +41,4 @@ $(document).ready(function() {
>     });
> });
> //]]>
>-</script>
>\ No newline at end of file
>+</script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>index 8bb49c1..e41477a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
>@@ -1,44 +1,4 @@
> [% INCLUDE 'blocking_errors.inc' %]
>-[% INCLUDE 'mana.inc' %]
>-<script type="text/javascript">
>-    //<![CDATA[
>-
>-    function confirm_close() {
>-        var is_confirmed = confirm(_("Are you sure you want to close this subscription?"));
>-        if (is_confirmed) {
>-            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=close";
>-        }
>-    }
>-    function confirm_reopen() {
>-        var is_confirmed = confirm(_("Are you sure you want to reopen this subscription?"));
>-        if (is_confirmed) {
>-            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=reopen";
>-        }
>-    }
>-
>-     $(document).ready(function() {
>-        $("#deletesub").click(function(){
>-            confirm_deletion();
>-            return false;
>-        });
>-        $("#reopen").click(function(){
>-            confirm_reopen();
>-            return false;
>-        });
>-        $("#close").click(function(){
>-            confirm_close();
>-            return false;
>-        });
>-        $("#renew").click(function(){
>-            popup([% subscriptionid %]);
>-            return false;
>-        })
>-        $("#mana-subscription-share").click(function() {
>-            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=share";
>-        });
>-     });
>-    //]]>
>-</script>
> [% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %]
>     <div id="toolbar" class="btn-toolbar">
>         [% IF CAN_user_serials_create_subscription %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index 06308f0..3e15c5e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -430,6 +430,7 @@
>         var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
>         var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?");
>     </script>
>+    [% INCLUDE 'mana.inc' %]
>     [% Asset.js("js/serials-toolbar.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js b/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js
>index fe575d0..9a3a5f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js
>@@ -41,6 +41,6 @@ function popup(subscriptionid) {
>         return false;
>     });
>     $("#mana-subscription-share").click(function() {
>-        window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=share";
>+        window.location="subscription-detail.pl?subscriptionid=" + subscriptionid + "&op=share";
>     });
>  });
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
>index 3981995..da8abd1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
>@@ -650,4 +650,4 @@ $(document).ready(function() {
>     $('#save-subscription').on("click", function(e){
>         $('select:disabled').removeAttr('disabled');
>     });
>-});
>\ No newline at end of file
>+});
>diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
>index 2dccd58..192a511 100755
>--- a/serials/subscription-detail.pl
>+++ b/serials/subscription-detail.pl
>@@ -62,7 +62,6 @@ my ($template, $loggedinuser, $cookie)
>                 debug => 1,
>                 });
> 
>-
> my $subs = GetSubscription($subscriptionid);
> $subs->{enddate} ||= GetExpirationDate($subscriptionid);
> 
>@@ -96,7 +95,8 @@ if ($op eq 'del') {
>     }
> }
> elsif ( $op and $op eq "share" ) {
>-    my $result = Koha::SharedContent::manaPostRequest($query->param('mana_language'), $loggedinuser, $subscriptionid, 'subscription');
>+    my $mana_language = $query->param('mana_language');
>+    my $result = Koha::SharedContent::manaPostRequest($mana_language, $loggedinuser, $subscriptionid, 'subscription');
>     $template->param( mana_code => $result->{msg} );
>     $subs->{mana_id} = $result->{id};
> }
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 17047: 56175 | 56176 | 56177 | 56178 | 56179 | 56180 | 56181 | 59728 | 59729 | 59931 | 61905 | 62045 | 62046 | 62047 | 62048 | 62049 | 62050 | 62051 | 62052 | 62053 | 62054 | 62075 | 62465 | 62475 | 62485 | 62540 | 62542 | 62543 | 62544 | 62545 | 62546 | 62547 | 62548 | 62549 | 62550 | 62551 | 62552 | 62553 | 62589 | 62591 | 62592 | 62593 | 62594 | 62595 | 62596 | 62597 | 62598 | 62599 | 62603 | 62604 | 62605 | 62606 | 62607 | 62768 | 63476 | 63601 | 63618 | 63619 | 63620 | 63621 | 63622 | 63623 | 64484 | 64530 | 64618 | 64619 | 64620 | 64621 | 64622 | 64623 | 64624 | 64625 | 64626 | 64627 | 64628 | 64629 | 64630 | 64631 | 64632 | 64633 | 64634 | 64635 | 64636 | 64637 | 64638 | 64639 | 64640 | 64641 | 64642 | 64643 | 64648 | 64649 | 64650 | 64651 | 64652 | 64653 | 64654 | 64706 | 64962 | 65058 | 65059 | 65060 | 65061 | 65062 | 65063 | 65064 | 65065 | 65773 | 66667 | 66668 | 66987 | 67003 | 67004 | 67005 | 67006 | 67009 | 67010 | 67011 | 67012 | 67013 | 67014 | 67015 | 67016 | 67017 | 67018 | 67019 | 67020 | 67021 | 67022 | 67023 | 69034 | 69035 | 69036 | 69037 | 69038 | 69039 | 69040 | 69041 | 69091 | 70203 | 70204 | 70205 | 70206 | 70208 | 70209 | 70210 | 70211 | 70561 | 70874 | 72660 | 72661 | 72662 | 72663 | 72664 | 72665 | 72666 | 72667 | 72668 | 72669 | 72670 | 73699 | 73737 | 73738 | 73739 | 73740 | 73741 | 73742 | 73743 | 73744 | 73745 | 73746 | 73747 | 73748 | 73975 | 73976 | 73977 | 73978 | 73979 | 73980 | 73981 | 73982 | 73983 | 73984 | 73985 | 73986 | 76673 | 76674 | 76675 | 76676 | 76677 | 76678 | 76679 | 76680 | 76681 | 76682 | 76683 | 76684 | 78215 | 78216 | 78217 | 78218 | 78219 | 78220 | 78221 | 78222 | 78223 | 78224 | 78225 | 78226 | 78227 | 78228 | 78229 | 79868 | 79869 | 79870 | 79871 | 79872 | 79874 | 79877 | 79878 | 79879 | 79880 | 79881 | 79882 | 79883 | 79884 | 79885 | 79886 | 79887 | 79888 | 79922 | 79923 | 79924 | 79925 | 79926 | 79927 | 79928 | 79929 | 79930 | 79931 | 79932 | 79933 | 79934 | 79935 | 79936 | 79937 | 79938 | 79939 | 80183 | 80184 | 80185 | 80186 | 80187 | 80188 | 80189 | 80190 | 80191 | 80192 | 80193 | 80194 | 80195 | 80196 | 80197 | 80198 | 80199 | 80200 | 80471 | 80472 | 80473 | 80907 | 80908 | 80909 | 80910 | 80911 | 80912 | 80913 | 80914 | 80915 | 80916 | 80917 | 80918 | 80919 | 80920 | 80921 | 80922 | 80923 | 80924 | 81935 | 81936 | 81937 | 81938 | 81939 | 81940 | 81941 | 81942 | 81943 | 81944 | 81945 | 81946 | 81947 | 81948 | 81949 | 81950 | 81951 | 81952 | 81968 | 83863 | 83864 | 83865 | 83866 | 83867 | 83868 | 83869 | 83870 | 83871 | 83872 | 83873 | 83874 | 83875 | 83876 | 83877 | 83878 | 83879 | 83880 | 83881 | 83892 | 83893 | 83894 | 83895 | 83896 | 83897 | 83898 | 83899 | 83900 | 83901 | 83902 | 83903 | 83904 | 83905 | 83906 | 83907 | 83908 | 83909 | 83910 | 83911 | 83912 | 84142 | 84145 | 84210 | 84260 | 84261 | 84262 | 84263 | 84264 | 84265 | 84323 | 84324 | 84325 | 84326 | 84327 | 84328 | 84329 | 84332