Merge pull request #7235 from opf/feature/29253/show-migrations-error
[29253] Render error message in production on pending migrationspull/7242/head
Markus Kahl
6 years ago
committed by
GitHub
commit
68d3ff8a53
@ -1,24 +1,24 @@ |
||||
.top-shelf |
||||
.warning-bar--wrapper |
||||
position: fixed |
||||
bottom: 0 |
||||
z-index: 1001 |
||||
width: 100% |
||||
|
||||
.warning-bar--item |
||||
background-color: #f4f4aa |
||||
padding: 10px |
||||
|
||||
.top-shelf h1 |
||||
font-size: 12px |
||||
font-weight: bold |
||||
h1 |
||||
font-size: 12px |
||||
font-weight: bold |
||||
|
||||
.top-shelf p |
||||
font-size: 0.9rem |
||||
margin: 0 |
||||
p |
||||
font-size: 0.9rem |
||||
margin: 0 |
||||
|
||||
.top-shelf a |
||||
font-weight: bold |
||||
a |
||||
font-weight: bold |
||||
|
||||
.unsupported-browser-warning--pane |
||||
position: fixed |
||||
bottom: 0 |
||||
z-index: 1001 |
||||
width: 100% |
||||
|
||||
.unsupported-browser-warning--icon |
||||
cursor: pointer |
||||
|
||||
@ -0,0 +1,112 @@ |
||||
#-- encoding: UTF-8 |
||||
|
||||
#-- copyright |
||||
# OpenProject is a project management system. |
||||
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF) |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2017 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See doc/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
module ErrorsHelper |
||||
def render_400(options = {}) |
||||
@project = nil |
||||
render_error({ message: :notice_bad_request, status: 400 }.merge(options)) |
||||
false |
||||
end |
||||
|
||||
def render_403(options = {}) |
||||
@project = nil |
||||
render_error({ message: :notice_not_authorized, status: 403 }.merge(options)) |
||||
false |
||||
end |
||||
|
||||
def render_404(options = {}) |
||||
render_error({ message: :notice_file_not_found, status: 404 }.merge(options)) |
||||
false |
||||
end |
||||
|
||||
def render_500(options = {}) |
||||
message = t(:notice_internal_server_error, app_title: Setting.app_title) |
||||
|
||||
if $ERROR_INFO.is_a?(ActionView::ActionViewError) |
||||
@template.instance_variable_set('@project', nil) |
||||
@template.instance_variable_set('@status', 500) |
||||
@template.instance_variable_set('@message', message) |
||||
else |
||||
@project = nil |
||||
end |
||||
|
||||
# Append error information |
||||
if current_user.admin? |
||||
options[:message_details] = get_additional_message |
||||
end |
||||
|
||||
render_error({ message: message }.merge(options)) |
||||
false |
||||
end |
||||
|
||||
def get_additional_message |
||||
return unless OpenProject::Configuration.migration_check_on_exceptions? |
||||
|
||||
if OpenProject::Database.migrations_pending?(ensure_fresh: true) |
||||
I18n.t(:error_migrations_are_pending) |
||||
end |
||||
end |
||||
|
||||
def render_optional_error_file(status_code) |
||||
user_setup unless User.current.id == session[:user_id] |
||||
|
||||
case status_code |
||||
when :not_found |
||||
render_404 |
||||
when :internal_server_error |
||||
render_500 |
||||
else |
||||
super |
||||
end |
||||
end |
||||
|
||||
# Renders an error response |
||||
def render_error(arg) |
||||
arg = { message: arg } unless arg.is_a?(Hash) |
||||
|
||||
@status = arg[:status] || 500 |
||||
@message = arg[:message] |
||||
|
||||
if @status >= 500 |
||||
op_handle_error "[Error #@status] #@message" |
||||
end |
||||
|
||||
@message = l(@message) if @message.is_a?(Symbol) |
||||
@message_details = arg[:message_details] |
||||
respond_to do |format| |
||||
format.html do |
||||
render template: 'common/error', layout: use_layout, status: @status |
||||
end |
||||
format.any do |
||||
head @status |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,35 @@ |
||||
#-- encoding: UTF-8 |
||||
|
||||
#-- copyright |
||||
# OpenProject is a project management system. |
||||
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF) |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2017 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See doc/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
module MigrationsHelper |
||||
def render_pending_migrations_warning? |
||||
current_user.admin? && OpenProject::Database.migrations_pending? |
||||
end |
||||
end |
||||
@ -0,0 +1,9 @@ |
||||
<div id="pending-migrations-warning" class="warning-bar--item unsupported-browser-warning--pane"> |
||||
<p> |
||||
<span class="icon3 icon-warning"></span> |
||||
<strong><%= t(:error_migrations_are_pending) %></strong> |
||||
<br/> |
||||
<%= t(:error_migrations_visit_upgrade_guides) %>: |
||||
<%= static_link_to :upgrade_guides %> |
||||
</p> |
||||
</div> |
||||
@ -1,4 +1,4 @@ |
||||
<div id="unsupported-browser-warning" class="top-shelf unsupported-browser-warning--pane"> |
||||
<div id="unsupported-browser-warning" class="warning-bar--item unsupported-browser-warning--pane"> |
||||
<p> |
||||
<span title="<%= t('unsupported_browser.close_warning') %>" class="icon3 icon-warning unsupported-browser-warning--icon"></span> |
||||
<strong><%= t('unsupported_browser.title') %></strong> |
||||
@ -0,0 +1,4 @@ |
||||
<div class="warning-bar--wrapper"> |
||||
<%= render partial: 'warning_bar/pending_migrations' if render_pending_migrations_warning? %> |
||||
<%= render partial: 'warning_bar/unsupported_browser' if unsupported_browser? %> |
||||
</div> |
||||
Loading…
Reference in new issue