Skip to content

Commit

Permalink
Merge be5fccc into 7f31760
Browse files Browse the repository at this point in the history
  • Loading branch information
jermnelson committed Sep 4, 2018
2 parents 7f31760 + be5fccc commit d347eec
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
11 changes: 11 additions & 0 deletions app/controllers/bundle_context_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class BundleContextController < ApplicationController

def index
end

def create
logger.debug("BundleContextController.create called")
PreassemblyJob.perform_later
end

end
11 changes: 0 additions & 11 deletions app/controllers/template_controller.rb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3>Complete the YAML form below</h3>
<%= form_with url: "/template", local: true do |form| %>
<%= form_with url: "/bundle_context", local: true do |form| %>
<div class="row">
<div class="col-5">
<%= form.label :project %>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container mt-3">
<div class="row">
<section class="col-7">
<%= render "template/yaml_form" %>
<%= render "bundle_context/yaml_form" %>
</section>
<section class="col-5">
<ul class="nav nav-pills nav-fill">
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_header.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<nav class="navbar">
<a class="navbar-brand" href="#"><%= image_tag('sul-logo', height: '30') %></a>
<a class="navbar-brand" href="#"><%= image_tag('sul-logo.png', height: '30') %></a>
</nav>
<div style="background-color: #8c1515; color: white; font-family: serif">
<h1 class="p-4">Accessioning</h1>
<%= image_tag("bookheader", width: "100%", height: "75") %>
<%= image_tag("bookheader.png", width: "100%", height: "75") %>
</div>
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
resources :template
resources :bundle_context
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'rails_helper'

RSpec.describe TemplateController, type: :controller do
RSpec.describe BundleContextController, type: :controller do

context 'GET index' do
it "renders the index template" do
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'rails_helper'

RSpec.describe 'template/index' do
RSpec.describe 'bundle_context/index' do
it 'displays the form correctly' do
# Should render the test page
render
Expand Down

0 comments on commit d347eec

Please sign in to comment.