Skip to content

Commit

Permalink
Fix accidentally commited merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Klaus Zanders committed May 22, 2024
1 parent 166803e commit 5afa381
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions app/components/projects/table_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,10 @@ def build_sort_header(column, options)
# We don't return the project row
# but the [project, level] array from the helper
def rows
<<<<<<< HEAD
@rows ||=
begin
projects_enumerator = ->(model) { to_enum(:projects_with_levels_order_sensitive, model).to_a }
instance_exec(model, &projects_enumerator)
end
=======
@rows ||= begin
projects_enumerator = ->(model) { to_enum(:projects_with_levels_order_sensitive, model).to_a }
instance_exec(model, &projects_enumerator)
end
>>>>>>> 0e1a80b408 (Add methods to publish and unpublish a project list based on permission)
end

def initialize_sorted_model
Expand Down Expand Up @@ -126,8 +118,8 @@ def columns
index = columns.index { |column| column.attribute == :name }
columns.insert(index, ::Queries::Projects::Selects::Default.new(:hierarchy)) if index

columns
end
columns
end
end

def projects(query)
Expand Down

0 comments on commit 5afa381

Please sign in to comment.