mirror of
https://github.com/we-promise/sure.git
synced 2026-04-19 12:04:08 +00:00
Move categories to top-level namespace (#894)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
class Transactions::Categories::DeletionsController < ApplicationController
|
||||
class Categories::DeletionsController < ApplicationController
|
||||
layout "with_sidebar"
|
||||
|
||||
before_action :set_category
|
||||
@@ -15,12 +15,12 @@ class Transactions::Categories::DeletionsController < ApplicationController
|
||||
|
||||
private
|
||||
def set_category
|
||||
@category = Current.family.transaction_categories.find(params[:category_id])
|
||||
@category = Current.family.categories.find(params[:category_id])
|
||||
end
|
||||
|
||||
def set_replacement_category
|
||||
if params[:replacement_category_id].present?
|
||||
@replacement_category = Current.family.transaction_categories.find(params[:replacement_category_id])
|
||||
@replacement_category = Current.family.categories.find(params[:replacement_category_id])
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,4 +1,4 @@
|
||||
class Transactions::Categories::DropdownsController < ApplicationController
|
||||
class Categories::DropdownsController < ApplicationController
|
||||
before_action :set_from_params
|
||||
|
||||
def show
|
||||
@@ -17,6 +17,6 @@ class Transactions::Categories::DropdownsController < ApplicationController
|
||||
end
|
||||
|
||||
def categories_scope
|
||||
Current.family.transaction_categories.alphabetically
|
||||
Current.family.categories.alphabetically
|
||||
end
|
||||
end
|
||||
@@ -1,20 +1,20 @@
|
||||
class Transactions::CategoriesController < ApplicationController
|
||||
class CategoriesController < ApplicationController
|
||||
layout "with_sidebar"
|
||||
|
||||
before_action :set_category, only: %i[ edit update ]
|
||||
before_action :set_transaction, only: :create
|
||||
|
||||
def index
|
||||
@categories = Current.family.transaction_categories.alphabetically
|
||||
@categories = Current.family.categories.alphabetically
|
||||
end
|
||||
|
||||
def new
|
||||
@category = Current.family.transaction_categories.new color: Transaction::Category::COLORS.sample
|
||||
@category = Current.family.categories.new color: Category::COLORS.sample
|
||||
end
|
||||
|
||||
def create
|
||||
Transaction::Category.transaction do
|
||||
category = Current.family.transaction_categories.create!(category_params)
|
||||
Category.transaction do
|
||||
category = Current.family.categories.create!(category_params)
|
||||
@transaction.update!(category_id: category.id) if @transaction
|
||||
end
|
||||
|
||||
@@ -32,7 +32,7 @@ class Transactions::CategoriesController < ApplicationController
|
||||
|
||||
private
|
||||
def set_category
|
||||
@category = Current.family.transaction_categories.find(params[:id])
|
||||
@category = Current.family.categories.find(params[:id])
|
||||
end
|
||||
|
||||
def set_transaction
|
||||
@@ -42,6 +42,6 @@ class Transactions::CategoriesController < ApplicationController
|
||||
end
|
||||
|
||||
def category_params
|
||||
params.require(:transaction_category).permit(:name, :color)
|
||||
params.require(:category).permit(:name, :color)
|
||||
end
|
||||
end
|
||||
@@ -16,7 +16,7 @@ class RegistrationsController < ApplicationController
|
||||
@user.role = :admin
|
||||
|
||||
if @user.save
|
||||
Transaction::Category.create_default_categories(@user.family)
|
||||
Category.create_default_categories(@user.family)
|
||||
login @user
|
||||
flash[:notice] = t(".success")
|
||||
redirect_to root_path
|
||||
|
||||
Reference in New Issue
Block a user