From 042cb3acfb62fd1e72845186b8c59d6f3f990b32 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 28 Jun 2018 09:31:50 +0000
Subject: [PATCH] FIX #8014 rm click on attach_link
---
modules/attachments/show_res_id.php | 21 +++++++++------------
package.json | 22 +++++++++++-----------
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/modules/attachments/show_res_id.php b/modules/attachments/show_res_id.php
index db209ba115f..65ed186699d 100755
--- a/modules/attachments/show_res_id.php
+++ b/modules/attachments/show_res_id.php
@@ -39,22 +39,19 @@ if (input_res) {
?>
input_chrono_id.value=<?php echo json_encode($arrayChrono); ?>;
<?php
+
} ?>
window.opener.$('attach_link').click();
} else { //INDEX_MLB
window.opener.$('res_id').value=<?php echo json_encode($_SESSION['stockCheckbox']); ?>;
- <?php
- if (_ID_TO_DISPLAY == 'chrono_number') {
- ?>
- window.opener.$('chrono_id').value=<?php echo json_encode($arrayChrono); ?>;
- <?php
- } ?>
+ <?php
+ if (_ID_TO_DISPLAY == 'chrono_number') {
+ ?>
+ window.opener.$('chrono_id').value=<?php echo json_encode($arrayChrono); ?>;
+ <?php
+
+ } ?>
}
-<?php
-if ($_SESSION['current_basket']['id'] == 'IndexingBasket') {
- ?>window.opener.$('attach_link').click();<?php
- }
-?>
self.close();
-</script>
+</script>
\ No newline at end of file
diff --git a/package.json b/package.json
index 24013eeef65..1142957dafe 100755
--- a/package.json
+++ b/package.json
@@ -27,20 +27,20 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.6.7",
- "@angular/animations": "^6.0.6",
+ "@angular/animations": "^6.0.7",
"@angular/cdk": "^6.3.1",
"@angular/cli": "^6.0.8",
- "@angular/common": "^6.0.6",
- "@angular/compiler": "^6.0.6",
- "@angular/compiler-cli": "^6.0.6",
- "@angular/core": "^6.0.6",
- "@angular/forms": "^6.0.6",
- "@angular/http": "^6.0.6",
+ "@angular/common": "^6.0.7",
+ "@angular/compiler": "^6.0.7",
+ "@angular/compiler-cli": "^6.0.7",
+ "@angular/core": "^6.0.7",
+ "@angular/forms": "^6.0.7",
+ "@angular/http": "^6.0.7",
"@angular/material": "^6.3.1",
- "@angular/platform-browser": "^6.0.6",
- "@angular/platform-browser-dynamic": "^6.0.6",
- "@angular/platform-server": "^6.0.6",
- "@angular/router": "^6.0.6",
+ "@angular/platform-browser": "^6.0.7",
+ "@angular/platform-browser-dynamic": "^6.0.7",
+ "@angular/platform-server": "^6.0.7",
+ "@angular/router": "^6.0.7",
"@types/datatables.net": "^1.10.11",
"@types/jquery": "^2.0.49",
"@types/node": "^7.0.66",
--
GitLab