Add common angular controller for frontend rendering without anything

pull/8453/head
Oliver Günther 4 years ago
parent b5e6121985
commit 1cfdbf594f
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 9
      app/controllers/angular_controller.rb
  2. 2
      frontend/src/app/modules/hal/services/hal-resource.service.ts
  3. 52
      modules/job_status/app/controllers/job_status/job_statuses_controller.rb
  4. 5
      modules/job_status/config/routes.rb
  5. 36
      modules/my_page/app/views/my_page/angular/no_menu.html.erb
  6. 2
      modules/my_page/config/routes.rb

@ -1,5 +1,4 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) 2012-2020 the OpenProject GmbH
@ -28,10 +27,12 @@
# See docs/COPYRIGHT.rdoc for more details.
#++
class MyPage::AngularController < ::ApplicationController
class AngularController < ApplicationController
before_action :require_login
def no_menu
render layout: 'no_menu'
def empty_layout
# Frontend will handle rendering
# but we will need to render with layout
render html: '', layout: 'angular'
end
end

@ -307,7 +307,7 @@ export class HalResourceService {
}
/**
* Get the hal type for an attributeex
* Get the hal type for an attribute
*
* @param type
* @param attribute

@ -1,52 +0,0 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) 2012-2020 the OpenProject GmbH
#
# 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 docs/COPYRIGHT.rdoc for more details.
#++
module JobStatus
class JobStatusesController < ::ApplicationController
before_action :authorize_on_job
layout 'angular'
def show
# Frontend will handle rendering
# but we will need to render with layout
render html: '', layout: true
end
private
def authorize_on_job
return if JobStatus::Status
.where(job_id: params[:job_uuid], user_id: current_user.id)
.exists?
render_404
end
end
end

@ -1,6 +1,3 @@
OpenProject::Application.routes.draw do
resources :job_statuses,
param: :job_uuid,
controller: 'job_status/job_statuses',
only: %i[show]
get '/job_statuses/:job_uuid', to: 'angular#empty_layout'
end

@ -1,36 +0,0 @@
<%#-- copyright
OpenProject is an open source project management software.
Copyright (C) 2012-2020 the OpenProject GmbH
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 docs/COPYRIGHT.rdoc for more details.
++#%>
<%= content_for :header_tags do %>
<%= nonced_javascript_tag do %>
<%= include_gon(need_tag: false) -%>
<% end %>
<% end -%>
<openproject-base></openproject-base>

@ -29,5 +29,5 @@
#++
OpenProject::Application.routes.draw do
get '/my/page', to: 'my_page/angular#no_menu'
get '/my/page', to: 'angular#empty_layout'
end

Loading…
Cancel
Save