mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Owners can invite mechanics again; who adds aircraft is an admin setting
- Admin → Settings → Who can add aircraft: administrators only (the default) or everyone. Adding an aircraft or importing a .sam.zip makes you its Owner, so this decides who can become one. - A signing invitation from an Owner of the aircraft (or an administrator) lets the outside mechanic create an account for the invited address again, with a password or by signing in with SSO; checked when it's used. Others' signing invitations still need an existing account, and say so. - Docs: who makes accounts, the new setting. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
19bc3efa19
commit
9a20c91f5e
30 files changed
+219
-40
No files matched your search
@@ -10,6 +10,9 @@ class Setting < ApplicationRecord
|
||||
"backups_kept" => { default: 14, in: 1..365 },
|
||||
"offsite_backups_kept" => { default: 30, in: 1..365 },
|
||||
"documents_claude_text" => { default: 0, in: 0..1 },
|
||||
# Who can add aircraft (and so become an Owner, who invites people): 0
|
||||
# administrators only, 1 everyone.
|
||||
"anyone_adds_aircraft" => { default: 0, in: 0..1 },
|
||||
"logbook_templates_seeded" => { default: 0, in: 0..1 } # internal flag
|
||||
}.freeze
|
||||
LABELS = LabelSet.new("setting.keys", INTEGERS.keys)
|
||||
@@ -20,6 +23,7 @@ class Setting < ApplicationRecord
|
||||
class << self
|
||||
def max_upload_mb = integer("max_upload_mb")
|
||||
def max_upload_bytes = max_upload_mb.megabytes
|
||||
def anyone_adds_aircraft? = integer("anyone_adds_aircraft") == 1
|
||||
|
||||
def integer(key)
|
||||
definition = INTEGERS.fetch(key)
|
||||
|
||||
@@ -22,4 +22,12 @@ class SigningInvitation < ApplicationRecord
|
||||
def self.find_usable(token) = where(token_digest: digest(token), used_at: nil).where("expires_at > ?", Time.current).first
|
||||
|
||||
def aircraft = logbook_entry.aircraft
|
||||
|
||||
# Whether the mechanic can make an account for the invited address with it:
|
||||
# when it's from an Owner of the aircraft or an administrator (still, when
|
||||
# it's used). Who can become an Owner is up to the administrator (Admin →
|
||||
# Settings, who can add aircraft); others' invitations need an account.
|
||||
def creates_account?
|
||||
invited_by.present? && !invited_by.disabled? && (invited_by.admin? || invited_by.role_for(aircraft)&.owner?) || false
|
||||
end
|
||||
end
|
||||
@@ -121,6 +121,10 @@ class User < ApplicationRecord
|
||||
aircraft_roles.includes(:role).find_by(aircraft: aircraft)&.role
|
||||
end
|
||||
|
||||
# Adding an aircraft (or importing one) makes you its Owner: administrators,
|
||||
# or everyone when Admin → Settings allows it.
|
||||
def can_add_aircraft? = admin? || Setting.anyone_adds_aircraft?
|
||||
|
||||
# Administrators can do everything on every aircraft.
|
||||
def can?(permission, aircraft)
|
||||
admin? || role_for(aircraft)&.can?(permission) || false
|
||||
|
||||
Reference in new issue
Block a user