cleaning destroys and messages
This commit is contained in:
@ -32,11 +32,10 @@ module Merged
|
||||
redirect_to section_cards_url(@section.id)
|
||||
end
|
||||
|
||||
def remove
|
||||
section = @card.section
|
||||
section.remove_card( @card )
|
||||
section.save
|
||||
redirect_to section_cards_url(section.id)
|
||||
def destroy
|
||||
@card.destroy
|
||||
@card.section.save
|
||||
redirect_to section_cards_url(@card.section.id) , notice: "Card #{@card.index + 1} removed"
|
||||
end
|
||||
|
||||
def update
|
||||
|
@ -1,24 +1,15 @@
|
||||
module Merged
|
||||
class PagesController < MergedController
|
||||
before_action :set_page, only: %i[ show edit update destroy ]
|
||||
before_action :set_page, only: %i[ update destroy ]
|
||||
|
||||
# GET /merged/pages
|
||||
def index
|
||||
@pages = Page.all.values
|
||||
end
|
||||
|
||||
# GET /merged/pages/1
|
||||
def show
|
||||
end
|
||||
|
||||
# GET /merged/pages/1/edit
|
||||
def edit
|
||||
end
|
||||
|
||||
# POST /merged/pages
|
||||
def create
|
||||
name = params[:name]
|
||||
message = Page.check_name(name)
|
||||
message = "Must enter name" if name.blank?
|
||||
if( message.nil?)
|
||||
@page = Page.build_new(name)
|
||||
redirect_to new_page_section_url(@page.name) , notice: "Page was successfully created."
|
||||
@ -29,30 +20,15 @@ module Merged
|
||||
end
|
||||
end
|
||||
|
||||
# PATCH/PUT /merged/pages/1
|
||||
def update
|
||||
if @page.update(page_params)
|
||||
redirect_to @page, notice: "Page was successfully updated."
|
||||
else
|
||||
render :edit, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
# DELETE /merged/pages/1
|
||||
def destroy
|
||||
Page.destroy(@page)
|
||||
redirect_to pages_url, notice: "Page #{@page.name} was removed."
|
||||
end
|
||||
|
||||
private
|
||||
# Use callbacks to share common setup or constraints between actions.
|
||||
def set_page
|
||||
@page = Page.find(params[:id])
|
||||
end
|
||||
def set_page
|
||||
@page = Page.find(params[:id])
|
||||
end
|
||||
|
||||
# Only allow a list of trusted parameters through.
|
||||
def page_params
|
||||
params.fetch(:page, {})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -29,11 +29,10 @@ module Merged
|
||||
end
|
||||
end
|
||||
|
||||
def remove
|
||||
page = @section.page
|
||||
page.remove_section( @section )
|
||||
page.save
|
||||
redirect_to page_sections_url(page.name)
|
||||
def destroy
|
||||
@section.destroy()
|
||||
@section.page.save
|
||||
redirect_to page_sections_url(@section.page.name) , notice: "Section #{@section.index + 1} removed"
|
||||
end
|
||||
|
||||
def set_image
|
||||
|
Reference in New Issue
Block a user