From 455e758653d710bdd54504a5bb0f23bfb7170cc5 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 23 Mar 2015 11:52:10 +0100
Subject: [PATCH] Fix CCTray URL

---
 app/utils/status-image-formats.coffee |  6 +++---
 app/utils/urls.coffee                 | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/utils/status-image-formats.coffee b/app/utils/status-image-formats.coffee
index a2faa313..4356464c 100644
--- a/app/utils/status-image-formats.coffee
+++ b/app/utils/status-image-formats.coffee
@@ -28,8 +28,8 @@ podStatusImage = ( (url, slug, branch) ->
   "=for HTML <a href=\"#{url}\"><img src=\"#{statusImageUrl(slug, branch)}\"></a>"
 )
 
-ccxmlStatusUrl = ( (slug) ->
-  ccXmlUrl(slug)
+ccxmlStatusUrl = ( (slug, branch) ->
+  ccXmlUrl(slug, branch)
 )
 
 format = (version, slug, branch) ->
@@ -43,7 +43,7 @@ format = (version, slug, branch) ->
     when 'AsciiDoc' then asciidocStatusImage(url, slug, branch)
     when 'Rst' then rstStatusImage(url, slug, branch)
     when 'Pod' then podStatusImage(url, slug, branch)
-    when 'CCTray' then ccxmlStatusUrl(url, slug, branch)
+    when 'CCTray' then ccxmlStatusUrl(slug, branch)
 
 
 `export default format`
diff --git a/app/utils/urls.coffee b/app/utils/urls.coffee
index 6f91752e..ac3ef3c3 100644
--- a/app/utils/urls.coffee
+++ b/app/utils/urls.coffee
@@ -28,12 +28,17 @@ statusImage = (slug, branch) ->
   else
     "#{location.protocol}//#{location.host}/#{slug}.svg" + if branch then "?branch=#{encodeURIComponent(branch)}" else ''
 
-ccXml = (slug) ->
+ccXml = (slug, branch) ->
+  url = "##{config.apiEndpoint}/repos/#{slug}/cc.xml"
+  if branch
+    url = "#{url}?branch=#{branch}"
+
   if config.pro
+    delimiter = if url.indexOf('?') == -1 then '?' else '&'
     token = Travis.__container__.lookup('controller:currentUser').get('token')
-    "##{config.apiEndpoint}/repos/#{slug}/cc.xml?token=#{token}"
-  else
-    "#{config.apiEndpoint}/repos/#{slug}/cc.xml"
+    url = "#{url}#{delimiter}token=#{token}"
+
+  url
 
 email = (email) ->
   "mailto:#{email}"