Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-24 15:49:39 +02:00
Code Issues Releases Activity Actions 1

Move categories to top-level namespace (#894)

Browse source
This commit is contained in:
Zach Gollwitzer 2024-06-20 08:15:09 -04:00 • committed by GitHub
parent a947db92b2
commit 2681dd96b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 229 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/transactions/categories/deletions_controller.rb → app/controllers/categories/deletions_controller.rb
View file

@ -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

4
app/controllers/transactions/categories/dropdowns_controller.rb → app/controllers/categories/dropdowns_controller.rb
View file

@ -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

14
app/controllers/transactions/categories_controller.rb → app/controllers/categories_controller.rb
View file

@ -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

2
app/controllers/registrations_controller.rb
View file

@ -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