Merge branch 'development' into feature/update-upload-ontology

ontoportal-lirmm · Jul 12, 2023 · 09d2109 · 09d2109
2 parents 7a961ea + 7e32ada
commit 09d2109
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss
@@ -6,7 +6,7 @@
 @import 'summary_section';
 @import 'dropdown';
 @import 'field_container';
+@import 'nested_form';
 @import 'input_field';
 @import 'file_input_loader';
 @import 'text_area_field';
-@import 'nested_form';
diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb
@@ -418,6 +418,7 @@ def update
     # Note: find_by_acronym includes ontology views
     @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology][:acronym] || params[:id]).first
     @ontology.update_from_params(ontology_params)
+    @ontology.viewOf = nil if @ontology.isView.eql? "0"
     error_response = @ontology.update
     if response_error?(error_response)
       @categories = LinkedData::Client::Models::Category.all

diff --git a/app/views/shared/_ontology_picker_single.html.erb b/app/views/shared/_ontology_picker_single.html.erb
@@ -10,8 +10,17 @@
 <%disabled ||= nil%>
 
 <script type="text/javascript">
-  jQuery(document).ready(function(){
-    jQuery("#<%=picker_id%>").chosen({search_contains: true});
+  jQuery(document).ready(function() {
+    jQuery("#<%= picker_id %>").chosen({ search_contains: true });
+
+    jQuery("#ontology_isView").change(function() {
+      if (this.checked) {
+        jQuery("#ontology_viewOf").prop("disabled", false).trigger("chosen:updated");
+      } else {
+        jQuery("#ontology_viewOf").val('').trigger("chosen:updated");
+        jQuery("#ontology_viewOf").prop("disabled", true).trigger("chosen:updated");
+      }
+    });
   });
 </script>
 

diff --git a/test/components/previews/nested_form_input_component_preview.rb b/test/components/previews/nested_form_input_component_preview.rb
@@ -16,9 +16,4 @@ def default(object_name: 'contact')
     end
   end
 
-  private
-
-  def long_text
-    "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
-  end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,9 +16,4 @@ def default(object_name: 'contact') @@
         end
       end
-      private
-      def long_text
-        "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
-      end
     end