From 8e2f8fc7f35e95795a1ebf6ccc89ba4e7ec6b82a Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 29 Dec 2014 15:30:43 +0100 Subject: [PATCH] [pro-merge] Add controllers and controller extensions from travis-pro --- assets/scripts/app/controllers.coffee | 26 +++++++++++++++++++ assets/scripts/app/controllers/profile.coffee | 5 ++++ assets/scripts/app/controllers/request.coffee | 10 +++++++ 3 files changed, 41 insertions(+) diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index 79e5392b..0db0ff54 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -42,6 +42,32 @@ Travis.FirstSyncController = Em.Controller.extend Travis.IndexErrorController = Em.Controller.extend() +Travis.QueuesController = Em.ArrayController.extend + content: (-> + Travis.Job.queued() + ).property() + +Travis.RunningJobsController = Em.ArrayController.extend + content: (-> + Travis.Job.running() + ).property() + +Travis.SidebarController = Em.ArrayController.extend + init: -> + @_super.apply this, arguments + @tickables = [] + + tips: [ + "Did you know that you can parallelize tests on Travis CI? Learn more" + "Did you know that you can split a build into several smaller pieces? Learn more" + "Did you know that you can skip a build? Learn more" + ] + + tip: (-> + if tips = @get('tips') + tips[Math.floor(Math.random()*tips.length)] + ).property().volatile() + require 'controllers/accounts' require 'controllers/auth' require 'controllers/account' diff --git a/assets/scripts/app/controllers/profile.coffee b/assets/scripts/app/controllers/profile.coffee index a2498206..a627a960 100644 --- a/assets/scripts/app/controllers/profile.coffee +++ b/assets/scripts/app/controllers/profile.coffee @@ -18,3 +18,8 @@ Travis.ProfileController = Travis.Controller.extend connectTab: (tab) -> viewClass = Travis["#{$.camelize(tab)}View"] @set('tab', tab) + + billingUrl: (-> + id = if @get('account.type') == 'user' then 'user' else @get('account.login') + "#{Travis.config.billing_endpoint}/subscriptions/#{id}" + ).property('account.login', 'account.type') diff --git a/assets/scripts/app/controllers/request.coffee b/assets/scripts/app/controllers/request.coffee index e825c410..57d1d279 100644 --- a/assets/scripts/app/controllers/request.coffee +++ b/assets/scripts/app/controllers/request.coffee @@ -19,3 +19,13 @@ Travis.RequestController = Ember.ObjectController.extend else 'Rejected' ).property('isAccepted') + + message: (-> + message = @get('model.message') + if Travis.features.pro && message == "private repository" + '' + else + message + ).property('model.message') + +