From ad400145484d9a967201c785cedcbc7c6ff7e288 Mon Sep 17 00:00:00 2001
From: Limraj <35842300+Limraj@users.noreply.github.com>
Date: Thu, 3 Sep 2020 13:22:21 +0200
Subject: [PATCH 1/4] #274 In Virtual data source editing, button "cancel"
 doesn't respone correctly - correct cancel button in point properties

---
 WebContent/WEB-INF/jsp/pointEdit/buttons.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp b/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
index e0f83a7e14..c2b895b908 100644
--- a/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
+++ b/WebContent/WEB-INF/jsp/pointEdit/buttons.jsp
@@ -37,7 +37,7 @@
       </c:choose>
       
       <input type="button" value="<fmt:message key="common.cancel"/>"
-              onclick="window.location='data_point_details.shtm?dpid=${form.id}';"/>
+              onclick="window.location='data_source_edit.shtm?dsid=${dataSource.id}&pid=${form.id}';"/>
     </td>
     <td></td>
   </tr>

From f3289126e9d19a08196d2fbb37fdf0bbb148f627 Mon Sep 17 00:00:00 2001
From: Limraj <35842300+Limraj@users.noreply.github.com>
Date: Mon, 7 Sep 2020 08:36:09 +0200
Subject: [PATCH 2/4] #274 In Virtual data source editing, button "cancel"
 doesn't respone correctly - travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ab6d28621e..e111d1b7ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ branches:
   - "/^siv/develop.*$/"
   - "/^siv/master.*$/"
   - "/^f_1165_1183/#1198.*$/"
+  - "/^feature_r23/#274.*$/"
 notifications:
   email: false
 env:

From e891e99f9e4512b2d0a937f8a4a3a43d44be75a2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bylica <grzegorz.bylica@gmail.com>
Date: Mon, 7 Sep 2020 14:37:06 +0200
Subject: [PATCH 3/4] Correcting build process for old issue

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e111d1b7ce..b746db959d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,9 @@ after_script:
 - docker version
 - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - export TAGISSUE=`echo $TRAVIS_BRANCH | egrep -o '[0-9][0-9][0-9][0-9]' | head -n1`
+- export TAGOLDISSUE=`echo $TRAVIS_BRANCH | egrep -o '[0-9][0-9][0-9]' | head -n1`
+- echo $TAGISSUE
+- export $TAGISSUE=`if [ "$TAGISSUE" == "" ]; then echo $TAGOLDISSUE; else echo $TAGISSUE ; fi`
 - echo $TAGISSUE
 - export TAG_DEV_OR_ISSUE=`if [ "$TRAVIS_BRANCH" == "siv/develop" ]; then echo "siv_dev"; else echo $TAGISSUE ; fi`
 - echo $TAG_DEV_OR_ISSUE

From 05248a3989954e2a4059b60e9a72636250e8c9ec Mon Sep 17 00:00:00 2001
From: Grzegorz Bylica <grzegorz.bylica@gmail.com>
Date: Mon, 7 Sep 2020 14:52:54 +0200
Subject: [PATCH 4/4] Next correcting process building old issue

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1134405916..5fc91c2432 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,7 +75,7 @@ after_script:
 - export TAGISSUE=`echo $TRAVIS_BRANCH | egrep -o '[0-9][0-9][0-9][0-9]' | head -n1`
 - export TAGOLDISSUE=`echo $TRAVIS_BRANCH | egrep -o '[0-9][0-9][0-9]' | head -n1`
 - echo $TAGISSUE
-- export $TAGISSUE=`if [ "$TAGISSUE" == "" ]; then echo $TAGOLDISSUE; else echo $TAGISSUE ; fi`
+- export TAGISSUE=`if [ "$TAGISSUE" == "" ]; then echo $TAGOLDISSUE; else echo $TAGISSUE ; fi`
 - echo $TAGISSUE
 - export TAG_DEV_OR_ISSUE=`if [ "$TRAVIS_BRANCH" == "siv/develop" ]; then echo "siv_dev"; else echo $TAGISSUE ; fi`
 - echo $TAG_DEV_OR_ISSUE