Move status into the settings object

Only the very early boot code needs to look at the value
from the environment directly.
This commit is contained in:
Tom Hughes 2019-03-16 16:29:12 +00:00
parent 6600221fe3
commit 141df02e67
14 changed files with 49 additions and 55 deletions

View file

@ -1,7 +1,7 @@
<% content_for :content do %>
<% if STATUS == :database_offline or STATUS == :api_offline %>
<% if Settings.status == "database_offline" or Settings.status == "api_offline" %>
<p><%= t 'layouts.osm_offline' %></p>
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
<% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %>
<p><%= t 'layouts.osm_read_only' %></p>
<% elsif !current_user.data_public? %>
<p><%= t '.not_public' %></p>

View file

@ -1,4 +1,4 @@
<% if STATUS == :database_offline %>
<% if Settings.status == "database_offline" %>
<p><%= t 'layouts.osm_offline' %>
</p>
<% else %>

View file

@ -1,7 +1,7 @@
<tr>
<% cl = cycle('table0', 'table1') %>
<td class="<%= cl %>">
<% if STATUS != :gpx_offline %>
<% if Settings.status != "gpx_offline" %>
<% if trace.inserted %>
<a href="<%= url_for :controller => 'traces', :action => 'show', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'traces', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
<% else %>

View file

@ -2,7 +2,7 @@
<h2><%= t '.heading', :name => h(@trace.name) %></h2>
<% end %>
<% if STATUS != :gpx_offline %>
<% if Settings.status != "gpx_offline" %>
<% if @trace.inserted %>
<img src="<%= url_for :controller => 'traces', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
<% else %>