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
@@ -38,6 +38,14 @@
|
||||
<p class="hint"><%= t(".with_off_site_backup_to") %></p>
|
||||
</div>
|
||||
|
||||
<h2 class="card-title pt-2"><%= t(".aircraft") %></h2>
|
||||
<div>
|
||||
<%= label_tag "settings[anyone_adds_aircraft]", t(".who_can_add_aircraft"), class: "label" %>
|
||||
<%= select_tag "settings[anyone_adds_aircraft]", options_for_select([ [ t(".administrators_only"), 0 ], [ t(".everyone"), 1 ] ], @values["anyone_adds_aircraft"].to_i),
|
||||
id: "settings_anyone_adds_aircraft", class: "input" %>
|
||||
<p class="hint"><%= t(".who_can_add_aircraft_hint") %></p>
|
||||
</div>
|
||||
|
||||
<h2 class="card-title pt-2"><%= t(".document_search") %></h2>
|
||||
<div>
|
||||
<%= label_tag "settings[documents_claude_text]", t(".read_scanned_documents_with"), class: "label" %>
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
<% content_for :title, t(".fleet") %>
|
||||
<div class="mb-5 flex items-center justify-between">
|
||||
<h1 class="text-2xl font-bold tracking-tight"><%= t(".fleet") %></h1>
|
||||
<% if current_user.can_add_aircraft? %>
|
||||
<div class="flex gap-2">
|
||||
<%= more_menu do %><%= link_to t(".import_from_a_sam_zip"), new_aircraft_import_path, class: "menu-item" %><% end %>
|
||||
<%= link_to t(".add_aircraft"), new_aircraft_path, class: "btn-primary" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% if @aircraft_list.empty? %>
|
||||
<div class="card card-body text-center">
|
||||
<p class="text-slate-600"><%= t(".no_aircraft_yet") %></p>
|
||||
<p class="mt-3"><%= link_to t(".add_your_first_aircraft"), new_aircraft_path, class: "btn-primary" %></p>
|
||||
<% if current_user.can_add_aircraft? %>
|
||||
<p class="mt-3"><%= link_to t(".add_your_first_aircraft"), new_aircraft_path, class: "btn-primary" %></p>
|
||||
<% else %>
|
||||
<p class="mt-2 text-sm text-slate-500"><%= t(".ask_an_administrator") %></p>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||
|
||||
@@ -5,7 +5,23 @@
|
||||
<div class="card card-body space-y-3">
|
||||
<%= link_to t(".i_have_an_account_sign"), new_session_path, class: "btn-primary w-full justify-center" %>
|
||||
</div>
|
||||
<% unless User.exists?(email_address: @invitation.email) %>
|
||||
<% if User.exists?(email_address: @invitation.email) %>
|
||||
<% elsif !@invitation.creates_account? %>
|
||||
<p class="text-sm text-slate-600"><%= t(".no_account_yet", email: @invitation.email) %></p>
|
||||
<% else %>
|
||||
<% if Sso.enabled? %>
|
||||
<%= button_to t(".continue_with", provider: Sso.label), "/auth/#{Sso::PROVIDER}", class: "btn-secondary w-full justify-center", data: { turbo: false } %>
|
||||
<% end %>
|
||||
<% if Sso.password_login? %>
|
||||
<%= form_with url: account_invited_signing_path(params[:token]), class: "card card-body space-y-3" do %>
|
||||
<h2 class="card-title"><%= t(".or_create_an_account") %></h2>
|
||||
<% if @account_errors.present? %><div class="rounded-md bg-red-50 p-2 text-sm text-red-700" role="alert"><%= @account_errors.to_sentence %></div><% end %>
|
||||
<div><label class="label" for="invited_email"><%= t(".email") %></label><input id="invited_email" class="input" value="<%= @invitation.email %>" disabled></div>
|
||||
<div><%= label_tag :name, t(".your_name"), class: "label" %><%= text_field_tag :name, params[:name], class: "input", required: true, autocomplete: "name" %></div>
|
||||
<div><%= label_tag :password, t(".password"), class: "label" %><%= password_field_tag :password, nil, class: "input", required: true, autocomplete: "new-password", minlength: User::PASSWORD_MIN, maxlength: 72 %><p class="hint"><%= t(".at_least_characters_not_one_html", min: User::PASSWORD_MIN) %></p></div>
|
||||
<div><%= label_tag :password_confirmation, t(".confirm_password"), class: "label" %><%= password_field_tag :password_confirmation, nil, class: "input", required: true, autocomplete: "new-password" %></div>
|
||||
<%= submit_tag t(".create_account"), class: "btn-secondary" %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
@@ -1,4 +1,4 @@
|
||||
<p><%= t(".asks_you_to_sign_a_html", owner: (@invitation.invited_by&.display_name || t(".the_owner")), tail_number: @entry.aircraft.tail_number, date: (fmt_date(@entry.date)), log_type: (LogbookEntry::LOG_TYPES[@entry.log_type])) %></p>
|
||||
<% if @invitation.message.present? %><p><em>“<%= @invitation.message %>”</em></p><% end %>
|
||||
<p><%= t(".the_link_works_once_until_html", link: (link_to t(".review_and_sign_the_entry"), @url), to_date: (fmt_date(@invitation.expires_at.to_date))) %></p>
|
||||
<p style="color:#64748b;font-size:12px"><%= t(".you_ll_sign_in_or_html", email: @invitation.email) %></p>
|
||||
<p style="color:#64748b;font-size:12px"><%= t(@invitation.creates_account? ? ".sign_in_or_create_html" : ".you_ll_sign_in_or_html", email: @invitation.email) %></p>
|
||||
@@ -7,4 +7,4 @@
|
||||
<%= raw t(".review_and_sign_it_here_text", to_date: (fmt_date(@invitation.expires_at.to_date))) %>
|
||||
<%= @url %>
|
||||
|
||||
<%= raw t(".you_ll_sign_in_or_text", email: @invitation.email) %>
|
||||
<%= raw t(@invitation.creates_account? ? ".sign_in_or_create_text" : ".you_ll_sign_in_or_text", email: @invitation.email) %>
|
||||
Reference in new issue
Block a user