Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Import portability checks complete

Browse Source
This commit is contained in:
cryptogopher 2024-11-16 02:31:53 +01:00
parent d9e74ed305
commit 41982e9dbc
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/application.css
View File

@ -410,7 +410,8 @@ table.items td.link a:hover:focus-visible {
color: #006c9b; color: #006c9b;
} }
table.items td:not(:first-child) { table.items td:not(:first-child),
.grayed {
color: var(--color-table-gray); color: var(--color-table-gray);
fill: var(--color-table-gray); fill: var(--color-table-gray);
} }

34
app/models/unit.rb
View File

@ -19,7 +19,7 @@ class Unit < ApplicationRecord
bases_units = arel_table.alias('bases_units') bases_units = arel_table.alias('bases_units')
other_units = arel_table.alias('other_units') other_units = arel_table.alias('other_units')
other_bases_units = arel_table.alias('other_bases_units') other_bases_units = arel_table.alias('other_bases_units')
parent_units = arel_table.alias('parent_units') sub_units = arel_table.alias('sub_units')
Unit.with(units: self.with_defaults).left_joins(:base) Unit.with(units: self.with_defaults).left_joins(:base)
# Exclude Units that are/have default counterpart # Exclude Units that are/have default counterpart
@ -32,20 +32,30 @@ class Unit < ApplicationRecord
.and(other_units[:symbol].eq(arel_table[:symbol])) .and(other_units[:symbol].eq(arel_table[:symbol]))
.and(other_units[:user_id].not_eq(arel_table[:user_id])) .and(other_units[:user_id].not_eq(arel_table[:user_id]))
).exists ).exists
# Decide if Unit can be im-/exported based on existing hierarchy # Decide if Unit can be im-/exported based on existing hierarchy:
).joins( # * same base unit symbol has to exist
arel_table.create_join(parent_units, # * unit with subunits can only be ported to root
arel_table.create_on(
parent_units[:symbol].eq(bases_units[:symbol])
.and(parent_units[:user_id].not_eq(bases_units[:user_id]))
),
Arel::Nodes::OuterJoin)
).select( ).select(
arel_table[Arel.star], arel_table[Arel.star],
Arel::Nodes::IsNotDistinctFrom.new(parent_units[:symbol], bases_units[:symbol]) arel_table[:base_id].eq(nil).or(
.as('portable') (
Arel::SelectManager.new.project(1).from(other_units)
.join(sub_units).on(other_units[:id].eq(sub_units[:base_id]))
.where(
other_units[:symbol].eq(arel_table[:symbol])
.and(other_units[:user_id].not_eq(arel_table[:user_id]))
)
.exists.not
).and(
Arel::SelectManager.new.project(1).from(other_bases_units)
.where(
other_bases_units[:symbol].eq(bases_units[:symbol])
.and(other_bases_units[:user_id].not_eq(bases_units[:user_id]))
)
.exists
)
).as('portable')
) )
# complete portability check with children
} }
scope :ordered, ->{ scope :ordered, ->{
left_outer_joins(:base) left_outer_joins(:base)

7
app/views/default/units/_unit.html.erb
View File

@ -1,16 +1,17 @@
<%= tag.tr do %> <%= tag.tr do %>
<td class="<%= class_names({subunit: unit.base}) %>"> <td class="<%= class_names({subunit: unit.base, grayed: unit.default?}) %>">
<%= unit.symbol %> <%= unit.symbol %>
</td> </td>
<td class="actions"> <td class="actions">
<% if current_user.at_least(:active) && unit.default? %> <% if current_user.at_least(:active) && unit.default? %>
<%= image_button_to t('.import'), 'download-outline', import_default_unit_path(unit), <%= image_button_to t('.import'), 'download-outline', import_default_unit_path(unit),
disabled: !unit.portable? %> !unit.portable? ? {disabled: true, aria: {disabled: true}, tabindex: -1} : {} %>
<% end %> <% end %>
<% if current_user.at_least(:admin) %> <% if current_user.at_least(:admin) %>
<% if !unit.default? %> <% if !unit.default? %>
<%= image_button_to t('.export'), 'upload-outline', export_default_unit_path(unit) %> <%= image_button_to t('.export'), 'upload-outline', export_default_unit_path(unit),
!unit.portable? ? {disabled: true, aria: {disabled: true}, tabindex: -1} : {} %>
<% else %> <% else %>
<%= image_button_to t('.delete'), 'delete-outline', unit_path(unit), <%= image_button_to t('.delete'), 'delete-outline', unit_path(unit),
method: :delete %> method: :delete %>