rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity

fix default_host for dev and test environments

Browse Source
This commit is contained in:
Sylvain 2016-09-29 10:02:31 +02:00
parent 57cb6c4fbe
commit c2d2786515
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/controllers/application.coffee.erb
View File

@ -23,14 +23,15 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# @param user {Object} Rails/Devise user # @param user {Object} Rails/Devise user
## ##
$scope.setCurrentUser = (user) -> $scope.setCurrentUser = (user) ->
$rootScope.currentUser = user unless angular.isUndefinedOrNull(user)
Session.create(user); $rootScope.currentUser = user
getNotifications() Session.create(user);
# fab-manager's app-version getNotifications()
if user.role == 'admin' # fab-manager's app-version
$scope.version = Version.get() if user.role == 'admin'
else $scope.version = Version.get()
$scope.version = {version: ''} else
$scope.version = {version: ''}
## ##

4
config/secrets.yml
View File

@ -17,6 +17,8 @@ development:
stripe_currency: <%= ENV["STRIPE_CURRENCY"] %> stripe_currency: <%= ENV["STRIPE_CURRENCY"] %>
disqus_shortname: <%= ENV["DISQUS_SHORTNAME"] %> disqus_shortname: <%= ENV["DISQUS_SHORTNAME"] %>
fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %> fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %>
default_host: <%= ENV["DEFAULT_HOST"] %>
default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
time_zone: <%= ENV["TIME_ZONE"] %> time_zone: <%= ENV["TIME_ZONE"] %>
week_starting_day: <%= ENV["WEEK_STARTING_DAY"] %> week_starting_day: <%= ENV["WEEK_STARTING_DAY"] %>
d3_date_format: <%= ENV["D3_DATE_FORMAT"].dump %> # .dump is needed as the value may start by a '%', see https://github.com/tenderlove/psych/issues/75 d3_date_format: <%= ENV["D3_DATE_FORMAT"].dump %> # .dump is needed as the value may start by a '%', see https://github.com/tenderlove/psych/issues/75
@ -45,6 +47,8 @@ test:
stripe_currency: usd stripe_currency: usd
disqus_shortname: fablab-sleede disqus_shortname: fablab-sleede
fablab_without_plans: false fablab_without_plans: false
default_host: <%= ENV["DEFAULT_HOST"] %>
default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
time_zone: Paris time_zone: Paris
week_starting_day: monday week_starting_day: monday
d3_date_format: '%d/%m/%y' d3_date_format: '%d/%m/%y'