[phase-6]changed routes under project
This commit is contained in:
parent
e1ee6f8f64
commit
88da1209d3
@ -1,9 +1,10 @@
|
|||||||
class GlossaryTermsController < ApplicationController
|
class GlossaryTermsController < ApplicationController
|
||||||
|
|
||||||
before_action :find_term_from_id, only: [:show, :edit, :update, :destroy]
|
before_action :find_term_from_id, only: [:show, :edit, :update, :destroy]
|
||||||
|
before_action :find_project_from_id, only: [:index, :create]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@glossary_terms = GlossaryTerm.all
|
@glossary_terms = GlossaryTerm.where(project_id: @project.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@ -12,6 +13,7 @@ class GlossaryTermsController < ApplicationController
|
|||||||
|
|
||||||
def create
|
def create
|
||||||
term = GlossaryTerm.new(glossary_term_params)
|
term = GlossaryTerm.new(glossary_term_params)
|
||||||
|
term.project = @project
|
||||||
if term.save
|
if term.save
|
||||||
redirect_to term, notice: l(:notice_successful_create)
|
redirect_to term, notice: l(:notice_successful_create)
|
||||||
end
|
end
|
||||||
@ -30,8 +32,9 @@ class GlossaryTermsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
|
project = @term.project
|
||||||
@term.destroy
|
@term.destroy
|
||||||
redirect_to glossary_terms_path
|
redirect_to project.nil? ? home_path : project_glossary_terms_path(project)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Find the term whose id is the :id parameter
|
# Find the term whose id is the :id parameter
|
||||||
@ -41,6 +44,13 @@ class GlossaryTermsController < ApplicationController
|
|||||||
render_404
|
render_404
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Find the project whose id is the :project_id parameter
|
||||||
|
def find_project_from_id
|
||||||
|
@project = Project.find(params[:project_id])
|
||||||
|
rescue ActiveRecord::RecordNotFound
|
||||||
|
render_404
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def glossary_term_params
|
def glossary_term_params
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<h2><%=l :label_glossary_terms %></h2>
|
<h2><%=l :label_glossary_terms %></h2>
|
||||||
|
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to l(:label_glossary_term_new), new_glossary_term_path, class: 'icon icon-add' %>
|
<%= link_to l(:label_glossary_term_new), new_project_glossary_term_path, class: 'icon icon-add' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table class="list">
|
<table class="list">
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<h2><%=l :label_glossary_term_new %></h2>
|
<h2><%=l :label_glossary_term_new %></h2>
|
||||||
|
|
||||||
<%= labelled_form_for :glossary_term, @term,
|
<%= labelled_form_for :glossary_term, @term,
|
||||||
url: glossary_terms_path do |f| %>
|
url: project_glossary_terms_path do |f| %>
|
||||||
<%= render partial: 'glossary_terms/form', locals: {form: f} %>
|
<%= render partial: 'glossary_terms/form', locals: {form: f} %>
|
||||||
<%= f.submit l(:button_create) %>
|
<%= f.submit l(:button_create) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
# See: http://guides.rubyonrails.org/routing.html
|
# See: http://guides.rubyonrails.org/routing.html
|
||||||
|
|
||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
|
resources :projects, shallow: true do
|
||||||
resources :glossary_terms
|
resources :glossary_terms
|
||||||
|
end
|
||||||
resources :glossary_categories
|
resources :glossary_categories
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user