diff --git a/.travis.yml b/.travis.yml index 7ce14dde37..5fc91c2432 100644 --- a/.travis.yml +++ b/.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 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 @@ " - onclick="window.location='data_point_details.shtm?dpid=${form.id}';"/> + onclick="window.location='data_source_edit.shtm?dsid=${dataSource.id}&pid=${form.id}';"/>