Merge pull request #1368 from SCADA-LTS/feature_r23/#274_In_Virtual_d…

…ata_source_editing_button_cancel_doesnt_respone_correctly

#274 In Virtual data source editing, button "cancel" doesn't respone …

.travis.yml

@@ -36,6 +36,7 @@ branches:
   - "/^siv/master.*$/"
   - "/^feature/#1342.*$/"
   - "/^f_1165_1183/#1198.*$/"
+  - "/^feature_r23/#274.*$/"
   - "/^feature_r23/#1349.*$/"
   - "/^feature_rs23/#1359.*$/"
 notifications:
@@ -72,6 +73,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

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>