mirror of
https://github.com/we-promise/sure.git
synced 2026-09-02 13:21:17 +00:00
* feat(budgets): add per-user personal budgets with strict isolation Families can now opt into personal budgets (toggleable via family settings): each family member gets their own budget for a given period instead of sharing a single family-wide budget. - Add families.personal_budgets flag and budgets.user_id, with partial unique indexes so shared budgets (user_id IS NULL) and personal budgets (user_id IS NOT NULL) can't collide. - Budget.find_or_bootstrap scopes lookup/creation by user when the family has personal_budgets enabled. - Scope most_recent_initialized_budget (used to seed a new budget from the prior period) by user_id so one user's copy-forward never bleeds into another user's budget. - budgets.user_id cascades on user deletion so personal budgets don't outlive their owner. * feat(budgets): enforce user-specific budget ownership and cascade deletion * feat(budgets): display user name for personal budgets in budget card on the plan section * feat(budgets): enhance personal budgets display for admins with preview feature indication * feat(budgets): enforce user-specific budget and category visibility for personal budgets * feat(budgets): create budget section titles and add translations notice in preferences * feat(budgets): let household and personal budgets coexist with sharing Previously enabling personal_budgets made the shared household budget unreachable. Budget.find_or_bootstrap now takes an explicit household: flag so both can be resolved independently for the same period, with a new household_budget_enabled family setting to opt out of the household side and keep personal budgets only. Adds a BudgetShare model (read_only/read_write) so a member can grant another family member access to their personal budget, enforced via Budget#viewable_by?/editable_by? across BudgetsController, BudgetCategoriesController, PlansController, and the read-only API. Preferences gains a Budget sharing card (gated on preview access like the rest of the personal budgets UI) and an owner switcher pill ( Household / mine / shared-with-me) appears on the budget page and the Plan hub card. Also fixes personal budgets showing the same "actual spending" as the household budget: actual spending/income now scope to the budget owner's own accounts instead of the viewer's full accessible set, via a new accounts: override on IncomeStatement. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * feat(budgets): enhance budget switcher with icons and improved styling * feat(budgets): remove user name display from budget card and header * feat(budgets): remove unique index on taggable_type and taggable_id in taggings * feat(budgets): enhance budget sharing functionality and improve UI elements * Collapse personal budget migrations --------- Signed-off-by: JulienGourmet <69808509+jubbakka@users.noreply.github.com> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> Co-authored-by: sure-admin <sure-admin@splashblot.com>
154 lines
5.3 KiB
Ruby
154 lines
5.3 KiB
Ruby
class UsersController < ApplicationController
|
|
before_action :set_user
|
|
before_action :ensure_admin, only: %i[reset reset_with_sample_data]
|
|
|
|
def resend_confirmation_email
|
|
if @user.resend_confirmation_email
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
else
|
|
redirect_to settings_profile_path, alert: t(".no_pending_change")
|
|
end
|
|
end
|
|
|
|
def update
|
|
@user = Current.user
|
|
return if admin_family_change_requested? && !ensure_admin
|
|
|
|
if email_changed?
|
|
if @user.initiate_email_change(user_params[:email])
|
|
if Rails.application.config.app_mode.self_hosted? && !Setting.require_email_confirmation
|
|
handle_redirect(t(".success"))
|
|
else
|
|
redirect_to settings_profile_path, notice: t(".email_change_initiated")
|
|
end
|
|
else
|
|
error_message = @user.errors.any? ? @user.errors.full_messages.to_sentence : t(".email_change_failed")
|
|
redirect_to settings_profile_path, alert: error_message
|
|
end
|
|
else
|
|
was_ai_enabled = @user.ai_enabled
|
|
if @user.update(user_params.except(:redirect_to, :delete_profile_image))
|
|
@user.profile_image.purge if should_purge_profile_image?
|
|
|
|
# Add a special notice if AI was just enabled or disabled
|
|
notice = if !was_ai_enabled && @user.ai_enabled
|
|
"AI Assistant has been enabled successfully."
|
|
elsif was_ai_enabled && !@user.ai_enabled
|
|
"AI Assistant has been disabled."
|
|
else
|
|
t(".success")
|
|
end
|
|
|
|
respond_to do |format|
|
|
format.html { handle_redirect(notice) }
|
|
format.json { head :ok }
|
|
end
|
|
else
|
|
respond_to do |format|
|
|
format.html { redirect_to settings_profile_path, alert: @user.errors.full_messages.to_sentence }
|
|
format.json { render json: { errors: @user.errors.full_messages }, status: :unprocessable_entity }
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def reset
|
|
FamilyResetJob.perform_later(Current.family)
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
end
|
|
|
|
def reset_with_sample_data
|
|
FamilyResetJob.perform_later(Current.family, load_sample_data_for_email: @user.email)
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
end
|
|
|
|
def destroy
|
|
if @user.deactivate
|
|
Current.session.destroy
|
|
redirect_to root_path, notice: t(".success")
|
|
else
|
|
redirect_to settings_profile_path, alert: @user.errors.full_messages.to_sentence
|
|
end
|
|
end
|
|
|
|
def rule_prompt_settings
|
|
@user.update!(rule_prompt_settings_params)
|
|
redirect_back_or_to settings_profile_path
|
|
end
|
|
|
|
private
|
|
def handle_redirect(notice)
|
|
case user_params[:redirect_to]
|
|
when "onboarding_preferences"
|
|
redirect_to preferences_onboarding_path
|
|
when "home"
|
|
redirect_to root_path
|
|
when "preferences"
|
|
redirect_to settings_preferences_path, notice: notice
|
|
when "goals"
|
|
redirect_to goals_onboarding_path
|
|
when "trial"
|
|
redirect_to trial_onboarding_path
|
|
when "appearance"
|
|
redirect_to settings_appearance_path, notice: notice
|
|
when "ai_prompts"
|
|
redirect_to settings_ai_prompts_path, notice: notice
|
|
else
|
|
redirect_to settings_profile_path, notice: notice
|
|
end
|
|
end
|
|
|
|
def should_purge_profile_image?
|
|
user_params[:delete_profile_image] == "1" &&
|
|
user_params[:profile_image].blank?
|
|
end
|
|
|
|
def email_changed?
|
|
user_params[:email].present? && user_params[:email] != @user.email
|
|
end
|
|
|
|
def rule_prompt_settings_params
|
|
params.require(:user).permit(:rule_prompt_dismissed_at, :rule_prompts_disabled)
|
|
end
|
|
|
|
def user_params
|
|
family_attrs = [ :name, :currency, :country, :date_format, :timezone, :locale, :month_start_day, :id ]
|
|
if Current.user.admin?
|
|
family_attrs.push(:personal_budgets, :household_budget_enabled) # Needed for updating existing family
|
|
family_attrs.push(:moniker, :default_account_sharing)
|
|
family_attrs << { enabled_currencies: [] }
|
|
end
|
|
|
|
params.require(:user).permit(
|
|
:first_name, :last_name, :email, :profile_image, :redirect_to, :delete_profile_image, :onboarded_at,
|
|
:show_sidebar, :default_period, :default_account_order, :show_ai_sidebar, :ai_enabled, :theme, :set_onboarding_preferences_at, :set_onboarding_goals_at, :locale,
|
|
family_attributes: family_attrs,
|
|
goals: []
|
|
)
|
|
end
|
|
|
|
def set_user
|
|
@user = Current.user
|
|
end
|
|
|
|
def admin_family_change_requested?
|
|
family_attrs = params.dig(:user, :family_attributes)
|
|
return false if family_attrs.blank?
|
|
|
|
moniker_changed = family_attrs[:moniker].present? && family_attrs[:moniker] != Current.family.moniker
|
|
sharing_changed = family_attrs[:default_account_sharing].present? && family_attrs[:default_account_sharing] != Current.family.default_account_sharing
|
|
enabled_currencies_changed = family_attrs.key?(:enabled_currencies)
|
|
personal_budgets_changed = family_attrs.key?(:personal_budgets)
|
|
household_budget_enabled_changed = family_attrs.key?(:household_budget_enabled)
|
|
|
|
moniker_changed || sharing_changed || enabled_currencies_changed || personal_budgets_changed || household_budget_enabled_changed
|
|
end
|
|
|
|
def ensure_admin
|
|
return true if Current.user.admin?
|
|
|
|
redirect_to settings_profile_path, alert: I18n.t("users.reset.unauthorized")
|
|
false
|
|
end
|
|
end
|