Load new trial expired bundle in rails

pull/14589/head
jesusbotella 6 years ago
parent 3e5bed81a7
commit 5f9a6d037d

@ -23,6 +23,7 @@ class Admin::UsersController < Admin::AdminController
if current_user.locked?
@expiration_days = @user.remaining_days_deletion
@payments_url = @user.plan_url(request.protocol)
@has_new_dashboard = check_new_dashboard
render locals: { breadcrumb: false }
else
render_404
@ -34,4 +35,8 @@ class Admin::UsersController < Admin::AdminController
def setup_user
@user = current_user
end
def check_new_dashboard
current_user.builder_enabled? && current_user.has_feature_flag?('new-dashboard-feature')
end
end

@ -1,5 +1,9 @@
<%= content_for(:css) do %>
<%= stylesheet_link_tag 'dashboard' %>
<% if @has_new_dashboard %>
<%= stylesheet_link_tag 'new_dashboard', 'new_lockout' %>
<% else %>
<%= stylesheet_link_tag 'dashboard' %>
<% end %>
<% end %>
<%= content_for(:js) do %>
<script type="text/javascript">
@ -14,8 +18,17 @@
var iframe_src = '<%= @google_plus_config.iframe_src %>';
<% end %>
</script>
<%= javascript_include_tag 'common', 'common_vendor', 'lockout' -%>
<% if @has_new_dashboard %>
<%= javascript_include_tag 'common', 'common_vendor', 'new_lockout' -%>
<% else %>
<%= javascript_include_tag 'common', 'common_vendor', 'lockout' -%>
<% end %>
<% end %>
<% if @has_new_dashboard %>
<div id="root"></div>
<% else %>
<div class="DummyDashboard"></div>
<div class='Lockout OnBoarding-welcome'>
<div class="OnBoarding-welcomeContent">
@ -40,4 +53,6 @@
</div>
</div>
</div>
<%= render 'admin/shared/footer', :footer_margin => false %>
<% end %>

@ -132,6 +132,7 @@ module CartoDB
confirmation.js
organization.js
lockout.js
new_lockout.js
tipsy.js
modernizr.js
@ -155,6 +156,8 @@ module CartoDB
cartodb.css
front.css
editor.css
new_lockout.css
new_dashboard.css
common_editor3.css
editor3.css

Loading…
Cancel
Save