FMD-53 fix link in info sheet

wrk-fmd · May 10, 2020 · 04e4a15 · 04e4a15
1 parent 7ed3c4b
commit 04e4a15
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/main/view/src/main/webapp/WEB-INF/pages/qr_codes.jsp b/main/view/src/main/webapp/WEB-INF/pages/qr_codes.jsp
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
-<%@taglib uri="http://www.springframework.org/security/tags" prefix="sec"%>
-<%@taglib uri="coceso" prefix="t"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@taglib uri="http://www.springframework.org/tags" prefix="spring" %>
+<%@taglib uri="http://www.springframework.org/security/tags" prefix="sec" %>
+<%@taglib uri="coceso" prefix="t" %>
 <%--
 /**
  * CoCeSo
@@ -89,10 +89,10 @@
 <div class="filtered-units">
   <!-- ko foreach: filteredUnits -->
   <div class="unit" data-bind="descendantsComplete: paintQrCode()">
-    <div class="qr" data-bind="attr: {'id': qrId}"></div>
+    <div class="qr" data-bind="attr: { id: qrId }"></div>
     <h1 data-bind="text: unitHeader"></h1>
     <p class="link-paragraph">
-      <a class="line-wrap" data-bind="href: generatedUrl, text: generatedUrl"></a>
+      <a class="line-wrap" data-bind="text: generatedUrl, attr: { href: generatedUrl }"></a>
     </p>
     <div class="info-content" data-bind="html: infoContent"></div>
   </div>

diff --git a/main/view/src/main/webapp/static/geobroker_qr_info.html b/main/view/src/main/webapp/static/geobroker_qr_info.html
@@ -1,10 +1,18 @@
 <!DOCTYPE html>
 <!--
-  ~ Copyright (c) 2018 Red Cross Vienna and contributors. All rights reserved.
-  ~
-  ~ This software may be modified and distributed under the terms of the MIT license. See the LICENSE file for details.
-  -->
-
+/**
+ * CoCeSo
+ * Template for QR code handout sheets.
+ * Copyright (c) WRK\Coceso-Team
+ *
+ * Licensed under the GNU General Public License, version 3 (GPL-3.0)
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright (c) 2020 WRK\Coceso-Team
+ * @link https://github.com/wrk-fmd/CoCeSo
+ * @license GPL-3.0 http://opensource.org/licenses/GPL-3.0
+ */
+-->
 <html lang="de">
 <head>
     <meta charset="UTF-8">

diff --git a/main/view/src/main/webapp/static/js/edit/viewmodels/qr_code_filter.js b/main/view/src/main/webapp/static/js/edit/viewmodels/qr_code_filter.js
@@ -6,7 +6,7 @@
  * Licensed under the GNU General Public License, version 3 (GPL-3.0)
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright (c) 2016 WRK\Coceso-Team
+ * @copyright Copyright (c) 2020 WRK\Coceso-Team
  * @link https://github.com/wrk-fmd/CoCeSo
  * @license GPL-3.0 http://opensource.org/licenses/GPL-3.0
  */

diff --git a/main/view/src/main/webapp/static/js/qr_codes.js b/main/view/src/main/webapp/static/js/qr_codes.js
@@ -6,7 +6,7 @@
  * Licensed under the GNU General Public License, version 3 (GPL-3.0)
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright Copyright (c) 2016 WRK\Coceso-Team
+ * @copyright Copyright (c) 2020 WRK\Coceso-Team
  * @link https://github.com/wrk-fmd/CoCeSo
  * @license GPL-3.0 http://opensource.org/licenses/GPL-3.0
  */
@@ -15,6 +15,7 @@ require(["config"], function() {
   require(["knockout", "edit/viewmodels/qr_code_filter"], function(ko, QrCodeFilter) {
     "use strict";
     var qrCodefilter = new QrCodeFilter();
+    ko.options.deferUpdates = true;
     ko.applyBindings(qrCodefilter);
   });
 });