mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-07-22 22:59:39 +02:00
Don't allow a subcategory to be assigned to another subcategory to ensure 1 level of nesting max (#1730)
* Improve category level limit validation * Set categories list only for non parents * Disable select field * Add info about the disabled select * Don’t render a select input for parent categories * Handle correctly turbo_stream request format * Add turbo_stream format to requests on create and update action's tests * Remove no_content status from update action * Revert "Remove no_content status from update action" This reverts commit866140c196
. * Revert "Add turbo_stream format to requests on create and update action's tests" This reverts commitc6bf21490f
. * Add correct redirect url for both html and turbo_stream formats * Remove useless turbo_frame_tag
This commit is contained in:
parent
3b0f8ae8c2
commit
0b17976256
3 changed files with 31 additions and 8 deletions
|
@ -2,6 +2,7 @@ class CategoriesController < ApplicationController
|
|||
layout :with_sidebar
|
||||
|
||||
before_action :set_category, only: %i[edit update destroy]
|
||||
before_action :set_categories, only: %i[update edit]
|
||||
before_action :set_transaction, only: :create
|
||||
|
||||
def index
|
||||
|
@ -10,7 +11,7 @@ class CategoriesController < ApplicationController
|
|||
|
||||
def new
|
||||
@category = Current.family.categories.new color: Category::COLORS.sample
|
||||
@categories = Current.family.categories.alphabetically.where(parent_id: nil).where.not(id: @category.id)
|
||||
set_categories
|
||||
end
|
||||
|
||||
def create
|
||||
|
@ -27,19 +28,26 @@ class CategoriesController < ApplicationController
|
|||
format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, redirect_target_url) }
|
||||
end
|
||||
else
|
||||
@categories = Current.family.categories.alphabetically.where(parent_id: nil).where.not(id: @category.id)
|
||||
set_categories
|
||||
render :new, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
@categories = Current.family.categories.alphabetically.where(parent_id: nil).where.not(id: @category.id)
|
||||
end
|
||||
|
||||
def update
|
||||
@category.update! category_params
|
||||
if @category.update(category_params)
|
||||
flash[:notice] = t(".success")
|
||||
|
||||
redirect_back_or_to categories_path, notice: t(".success")
|
||||
redirect_target_url = request.referer || categories_path
|
||||
respond_to do |format|
|
||||
format.html { redirect_back_or_to categories_path, notice: t(".success") }
|
||||
format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, redirect_target_url) }
|
||||
end
|
||||
else
|
||||
render :edit, status: :unprocessable_entity
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
|
@ -59,6 +67,14 @@ class CategoriesController < ApplicationController
|
|||
@category = Current.family.categories.find(params[:id])
|
||||
end
|
||||
|
||||
def set_categories
|
||||
@categories = unless @category.parent?
|
||||
Current.family.categories.alphabetically.roots.where.not(id: @category.id)
|
||||
else
|
||||
[]
|
||||
end
|
||||
end
|
||||
|
||||
def set_transaction
|
||||
if params[:transaction_id].present?
|
||||
@transaction = Current.family.transactions.find(params[:transaction_id])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue