Browse Source

Merge pull request #66 from lexintegritastech/improve-main-ui

Follow-up fixes for Initial Viewing Updates
pull/68/head
Alexander D. Bondoc 4 years ago committed by GitHub
parent
commit
5c4e66691e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb
  2. 4
      app/components/subject_index_form_component.rb
  3. 6
      app/components/subject_index_form_component/subject_index_form_component.html.erb

2
app/components/doctrines_offcanvas_accordion_component/doctrines_offcanvas_accordion_component.html.erb

@ -4,7 +4,7 @@
<% if search_result["has_children?"].present? %>
<div class="accordion-button collapsed m-0 p-0 sub-label<%= search_result["heirarchy_level"] + 1 %>" data-bs-toggle="collapse" data-bs-target="#<%= children_accordion_id %>"
data-controller="subjects" data-subject-parent-id="<%= search_result["id"] %>" data-accordion-target="#<%= accordion_body_id %>"
data-action="click->subjects#loadSubjectsOffcanvasAccordion">
data-action="click->subjects#loadDoctrinesOffcanvasAccordion">
<%= link_to search_result["name"], index_url, class: "accordion-link text-decoration-none text-dark d-block sub#{search_result["heirarchy_level"] + 1} clickable-link" %>
</div>
<% else %>

4
app/components/subject_index_form_component.rb

@ -4,10 +4,12 @@ class SubjectIndexFormComponent < BaseComponent
def initialize(current_user:, subject_index:, opts:)
@subject_index = subject_index
@opts = opts
@parent_id = @opts[:parent_id]
@parent_id = opts[:parent_id]
end
def parent
return if parent_id.blank?
Cdao::Subject.find(parent_id)
end

6
app/components/subject_index_form_component/subject_index_form_component.html.erb

@ -11,8 +11,10 @@
<div cass="row">
<div class="col-sm-12">
<strong> <%= label_tag :subjects %> </strong>
<select class="form-control subjects-selectize ps-0 pe-0" name="parent_id" id="parent_id" value="<%= parent_id %>">
<option value="<%= parent_id %>" selected="selected"> <%= parent.name %> </option>
<select class="form-control subjects-selectize ps-0 pe-0" name="parent_id" id="parent_id">
<% if parent_id.present? %>
<option value="<%= parent_id %>" selected="selected"> <%= parent.name %> </option>
<% end %>
</select>
</div>
</div>

Loading…
Cancel
Save