diff options
| author | Zog | 2017-12-15 17:54:31 +0100 | 
|---|---|---|
| committer | Zog | 2017-12-19 14:21:52 +0100 | 
| commit | 3a78b0d44affe79ec297f1a25ee3cfe4ecd32a74 (patch) | |
| tree | de6b3e6a258a7cadb83a97f019f67576738522a5 | |
| parent | 74a601f6f35e0a547d3cde0501081e6e9f509959 (diff) | |
| download | chouette-core-3a78b0d44affe79ec297f1a25ee3cfe4ecd32a74.tar.bz2 | |
Refs: #5291@1h; Update TableBuilderHelper
Update TableBuilderHelper to allow the `selectable` param to be a
lambda, thus allowing us to have row-based granularity.
| -rw-r--r-- | app/helpers/table_builder_helper.rb | 131 | ||||
| -rw-r--r-- | spec/helpers/table_builder_helper_spec.rb | 81 | ||||
| -rw-r--r-- | spec/views/offer_workbenches/show.html.erb_spec.rb | 2 | 
3 files changed, 149 insertions, 65 deletions
| diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb index 59906dc87..de78e903d 100644 --- a/app/helpers/table_builder_helper.rb +++ b/app/helpers/table_builder_helper.rb @@ -199,88 +199,92 @@ module TableBuilderHelper      end    end -  def tbody(collection, columns, selectable, links, overhead) -    model_name = TableBuilderHelper.item_row_class_name collection - -    content_tag :tbody do -      collection.map do |item| -        klass = "#{model_name}-#{item.id}" -        content_tag :tr, class: klass do -          bcont = [] - -          if selectable -            bcont << content_tag( -              :td, -              checkbox(id_name: item.try(:id), value: item.try(:id)) -            ) -          end - -          columns.each do |column| -            value = column.value(item) - -            if column.linkable? -              path = column.link_to(item) -              link = link_to(value, path) +  def tr item, columns, selectable, links, overhead, model_name +    klass = "#{model_name}-#{item.id}" +    content_tag :tr, class: klass do +      bcont = [] +      if selectable +        disabled = selectable.respond_to?(:call) && !selectable.call(item) +        bcont << content_tag( +          :td, +          checkbox(id_name: item.try(:id), value: item.try(:id), disabled: disabled) +        ) +      end -              if overhead.empty? -                bcont << content_tag(:td, link, title: 'Voir') +      columns.each do |column| +        value = column.value(item) -              else -                i = columns.index(column) +        if column.linkable? +          path = column.link_to(item) +          link = link_to(value, path) -                if overhead[i].blank? -                  if (i > 0) && (overhead[i - 1][:width] > 1) -                    clsArrayAlt = overhead[i - 1][:cls].split +          if overhead.empty? +            bcont << content_tag(:td, link, title: 'Voir') -                    bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArrayAlt)) +          else +            i = columns.index(column) -                  else -                    bcont << content_tag(:td, link, title: 'Voir') -                  end +            if overhead[i].blank? +              if (i > 0) && (overhead[i - 1][:width] > 1) +                clsArrayAlt = overhead[i - 1][:cls].split -                else -                  clsArray = overhead[columns.index(column)][:cls].split +                bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArrayAlt)) -                  bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArray)) -                end +              else +                bcont << content_tag(:td, link, title: 'Voir')                end              else -              if overhead.empty? -                bcont << content_tag(:td, value) +              clsArray = overhead[columns.index(column)][:cls].split -              else -                i = columns.index(column) +              bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArray)) +            end +          end -                if overhead[i].blank? -                  if (i > 0) && (overhead[i - 1][:width] > 1) -                    clsArrayAlt = overhead[i - 1][:cls].split +        else +          if overhead.empty? +            bcont << content_tag(:td, value) -                    bcont << content_tag(:td, value, class: td_cls(clsArrayAlt)) +          else +            i = columns.index(column) -                  else -                    bcont << content_tag(:td, value) -                  end +            if overhead[i].blank? +              if (i > 0) && (overhead[i - 1][:width] > 1) +                clsArrayAlt = overhead[i - 1][:cls].split -                else -                  clsArray = overhead[i][:cls].split +                bcont << content_tag(:td, value, class: td_cls(clsArrayAlt)) -                  bcont << content_tag(:td, value, class: td_cls(clsArray)) -                end +              else +                bcont << content_tag(:td, value)                end + +            else +              clsArray = overhead[i][:cls].split + +              bcont << content_tag(:td, value, class: td_cls(clsArray))              end            end +        end +      end -          if links.any? || item.try(:action_links).try(:any?) -            bcont << content_tag( -              :td, -              build_links(item, links), -              class: 'actions' -            ) -          end +      if links.any? || item.try(:action_links).try(:any?) +        bcont << content_tag( +          :td, +          build_links(item, links), +          class: 'actions' +        ) +      end -          bcont.join.html_safe -        end +      bcont.join.html_safe +    end +  end + +  def tbody(collection, columns, selectable, links, overhead) +    model_name = TableBuilderHelper.item_row_class_name collection + +    content_tag :tbody do +      collection.map do |item| +        tr item, columns, selectable, links, overhead, model_name        end.join.html_safe      end    end @@ -355,13 +359,14 @@ module TableBuilderHelper      end    end -  def checkbox(id_name:, value:) +  def checkbox(id_name:, value:, disabled: false)      content_tag :div, '', class: 'checkbox' do -      check_box_tag(id_name, value).concat( +      check_box_tag(id_name, value, nil, disabled: disabled).concat(          content_tag(:label, '', for: id_name)        )      end    end +    def gear_menu_link(link)      content_tag(        :li, diff --git a/spec/helpers/table_builder_helper_spec.rb b/spec/helpers/table_builder_helper_spec.rb index 3b0a18379..8c77bd465 100644 --- a/spec/helpers/table_builder_helper_spec.rb +++ b/spec/helpers/table_builder_helper_spec.rb @@ -381,5 +381,86 @@ describe TableBuilderHelper, type: :helper do        expect(beautified_html).to eq(expected.chomp)      end + +    context "on a single row" do +      let(:referential){ build_stubbed :referential } +      let(:other_referential){ build_stubbed :referential } +      let(:user_context){ +        UserContext.new( +          build_stubbed( +            :user, +            organisation: referential.organisation, +            permissions: [ +              'referentials.create', +              'referentials.update', +              'referentials.destroy', +            ] +          ), +          referential: referential +        ) +      } +      let(:columns){ +        [ +          TableBuilderHelper::Column.new( +            key: :name, +            attribute: 'name' +          ), +        ] +      } +      let(:item){ referential.decorate } +      let(:other_item){ other_referential.decorate } +      let(:selectable){ false } +      let(:links){ [:show] } +      let(:overhead){ [] } +      let(:model_name){ "referential" } +      let(:other_tr){ helper.send(:tr, other_item, columns, selectable, links, overhead, model_name) } +      let(:items){ [item, other_item] } + +      before(:each){ +        allow(helper).to receive(:current_user).and_return(user_context) +      } + +      context "with all rows non-selectable" do +        let(:selectable){ false } +        it "sets all rows as non selectable" do +          items.each do |i| +            tr = helper.send(:tr, i, columns, selectable, links, overhead, model_name) +            klass = "#{TableBuilderHelper.item_row_class_name([referential])}-#{i.id}" +            selector = "tr.#{klass} [type=checkbox]" +            expect(tr).to_not have_selector selector +          end +        end +      end + +      context "with all rows selectable" do +        let(:selectable){ true } +        it "adds a checkbox in all rows" do +          items.each do |i| +            tr = helper.send(:tr, i, columns, selectable, links, overhead, model_name) +            klass = "#{TableBuilderHelper.item_row_class_name([referential])}-#{i.id}" +            selector = "tr.#{klass} [type=checkbox]" +            expect(tr).to have_selector selector +          end +        end +      end + +      context "with THIS row non selectable" do +        let(:selectable){ ->(i){ i.id != item.id } } +        it "adds a checkbox in all rows" do +          items.each do |i| +            tr = helper.send(:tr, i, columns, selectable, links, overhead, model_name) +            klass = "#{TableBuilderHelper.item_row_class_name([referential])}-#{i.id}" +            selector = "tr.#{klass} [type=checkbox]" +            expect(tr).to have_selector selector +          end +        end +        it "disables this rows checkbox" do +          tr = helper.send(:tr, item, columns, selectable, links, overhead, model_name) +          klass = "#{TableBuilderHelper.item_row_class_name([referential])}-#{item.id}" +          selector = "tr.#{klass} [type=checkbox][disabled]" +          expect(tr).to have_selector selector +        end +      end +    end    end  end diff --git a/spec/views/offer_workbenches/show.html.erb_spec.rb b/spec/views/offer_workbenches/show.html.erb_spec.rb index 597335166..44dfe88f1 100644 --- a/spec/views/offer_workbenches/show.html.erb_spec.rb +++ b/spec/views/offer_workbenches/show.html.erb_spec.rb @@ -7,7 +7,6 @@ describe "workbenches/show", :type => :view do        create :line, objectid: id, line_referential: workbench.line_referential      end    } -    let!(:workbench){ assign :workbench, create(:workbench) }    let!(:same_organisation_referential){ create :workbench_referential, workbench: workbench, metadatas: [create(:referential_metadata, lines: lines)] }    let!(:different_organisation_referential){ create :workbench_referential, metadatas: [create(:referential_metadata, lines: lines)] } @@ -17,7 +16,6 @@ describe "workbenches/show", :type => :view do    }    let!(:q) { assign :q_for_form, Ransack::Search.new(Referential) }    before :each do -      lines      controller.request.path_parameters[:id] = workbench.id      expect(workbench.referentials).to include same_organisation_referential | 
