Fixing merge on moremember.pl (Deletion when IndependantBranches)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 7b9639b..e118d7e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -66,28 +66,6 @@ $(document).ready(function() {
                }
        });
  });
-function uncheck_sibling(me){
-nodename=me.getAttribute("name");
-if (nodename =="barcodes[]"){
-    var Node=me.parentNode.previousSibling;
-    while (Node.nodeName!="TD"){Node=Node.previousSibling}
-    var Nodes=Node.childNodes;
-    for (var i=0;i<Nodes.length;i++){
-      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
-        Nodes[i].checked=false;
-      }     
-   }   
-
-}else {
-    var Node=me.parentNode.nextSibling;
-    while (Node.nodeName!="TD"){Node=Node.nextSibling}
-    var Nodes=Node.childNodes;
-    for (var i=0;i<Nodes.length;i++){
-      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
-        Nodes[i].checked=false;
-      }     
-   }   
-}
 }
 
 //]]>
@@ -428,9 +406,9 @@ if (nodename =="barcodes[]"){
             <!-- TMPL_ELSE -->
             <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
             <!-- TMPL_IF NAME="red" -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" onclick="uncheck_sibling(this);" />
+            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
             <!-- TMPL_ELSE -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" onclick="uncheck_sibling(this);" />
+            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->"  />
             <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
             </td>
@@ -438,7 +416,7 @@ if (nodename =="barcodes[]"){
       <!-- TMPL_IF NAME="return_failed" -->
             <td class="problem">Return Failed</td>
        <!--TMPL_ELSE-->   
-            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
+            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" />
             <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
             </td>
       <!-- /TMPL_IF -->

diff --git a/members/moremember.pl b/members/moremember.pl
index 1fcfa57..0be8a53 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -355,7 +355,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 $template->param(
     detailview => 1,
     AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-<<<<<<< HEAD:members/moremember.pl
     DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(),
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
@@ -373,27 +372,6 @@ $template->param(
        is_child        => ($category_type eq 'C'),
        #                reserveloop     => \@reservedata,
        dateformat    => C4::Context->preference("dateformat"),
-=======
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    roaddetails     => $roaddetails,
-    borrowernumber  => $borrowernumber,
-    categoryname    => $data->{'description'},
-    reregistration  => $reregistration,
-    branch          => $branch,
-    totalprice      => sprintf("%.2f", $totalprice),
-    totaldue        => sprintf("%.2f", $total),
-    totaldue_raw    => $total,
-    issueloop       => \@issuedata,
-    overdues_exist  => $overdues_exist,
-    error           => $error,
-    $error          => 1,
-    StaffMember     => ($category_type eq 'S'),
-    is_child        => ($category_type eq 'C'),
-#   reserveloop     => \@reservedata,
-    dateformat      => C4::Context->preference("dateformat"),
-    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
-    samebranch     => $samebranch,
->>>>>>> 1be2c41... (bug #3284) fix borrower deletion in independantbranches mode:members/moremember.pl
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;