From 2fbedeff97bcfd6fb1a691f995dd04f2565f31ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Danyi?= Date: Tue, 30 Aug 2016 13:38:11 +0200 Subject: [PATCH] * url fixes * set value of external id if it exists --- bookmarkInstalation.html | 2 +- bookmarklet.js | 7 +++++++ bookmarkletLoader.js | 2 +- deploy.php | 6 +++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bookmarkInstalation.html b/bookmarkInstalation.html index eb821ce..8b5eae5 100644 --- a/bookmarkInstalation.html +++ b/bookmarkInstalation.html @@ -21,7 +21,7 @@ Just Drag'n'Drop the button into your Bookmarks
- CardPrinter + CardPrinter
diff --git a/bookmarklet.js b/bookmarklet.js index 95e471f..77b3b00 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -291,6 +291,13 @@ card.find(".issue-assignee").remove(); } + //ETH taurus-xft + if (data.externalIssueId) { + card.find(".issue-external-id").text(data.externalIssueId); + } else { + card.find(".issue-external-id").remove(); + } + //Due-Date if (data.dueDate) { card.find(".issue-due-date").text(data.dueDate); diff --git a/bookmarkletLoader.js b/bookmarkletLoader.js index c729bdc..8724c50 100644 --- a/bookmarkletLoader.js +++ b/bookmarkletLoader.js @@ -2,7 +2,7 @@ javascript:(function(){ var head = document.getElementsByTagName("head")[0]; var scriptElement = document.createElement("script"); - scriptElement.src = 'http://vasgyuro.tsp/~edvidan/jira-card-printer/bookmarklet.js'; + scriptElement.src = 'https://static.ragnarok.yvan.hu/jira-card-printer/bookmarklet.js'; head.appendChild(scriptElement); head.removeChild(scriptElement); })(); diff --git a/deploy.php b/deploy.php index 956860d..1e66f99 100644 --- a/deploy.php +++ b/deploy.php @@ -2,13 +2,13 @@ require 'recipe/common.php'; -server('prod', 'alfheim.yvan.hu', 2206) +server('prod', 'alfheim.ragnarok.yvan.hu', 2206) ->user('yvan') ->forwardAgent() // You can use identity key, ssh config, or username/password to auth on the server. ->stage('production') - ->env('deploy_path', '/var/www/cdn'); // Define the base path to deploy your project to. + ->env('deploy_path', '/mnt/apps/jira-card-printer'); // Define the base path to deploy your project to. -set('repository', 'ssh://gogs@gogs.ragnarok.yvan.hu:2206/yvan/jira-card-printer.git'); +set('repository', 'https://gogs.ragnarok.yvan.hu/yvan/jira-card-printer.git'); env('branch', 'taurus-xft'); task('deploy', [