-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2168 from sul-dlss/revert-revert
Revert "Revert "Inline the render_ds_profile_header""
- Loading branch information
Showing
18 changed files
with
260 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class DatastreamsController < ApplicationController | ||
| include Blacklight::Catalog | ||
| copy_blacklight_config_from CatalogController | ||
|
|
||
| before_action :show_aspect, only: %i[dc show edit] | ||
|
|
||
| def dc | ||
| respond_to do |format| | ||
| format.html { render layout: !request.xhr? } | ||
| end | ||
| end | ||
|
|
||
| def edit | ||
| @ds = @obj.datastreams[params[:id]] | ||
| render layout: !request.xhr? | ||
| end | ||
|
|
||
| def show | ||
| if params[:dsid] == 'full_dc' | ||
| @content = Nokogiri::XML(Dor::Services::Client.object(@obj.pid).metadata.dublin_core).prettify | ||
| else | ||
| @ds = @obj.datastreams[params[:id]] | ||
|
|
||
| @content = if @ds.respond_to? :ng_xml | ||
| Nokogiri::XML(@ds.ng_xml.to_s, &:noblanks).to_s | ||
| else | ||
| Nokogiri::XML(@ds.content, &:noblanks).to_s | ||
| end | ||
| end | ||
|
|
||
| raise ActionController::RoutingError, 'Not Found' if @content.nil? | ||
|
|
||
| respond_to do |format| | ||
| format.html { render layout: !request.xhr? } | ||
| end | ||
| end | ||
|
|
||
| ## | ||
| # @option params [String] `:content` the XML with which to replace the datastream | ||
| # @option params [String] `:id` the identifier for the datastream, e.g., `identityMetadata` | ||
| # @option params [String] `:item_id` the druid to modify | ||
| def update | ||
| @object = Dor.find params[:item_id] | ||
| authorize! :manage_item, @object | ||
|
|
||
| raise ArgumentError, 'Missing content' if params[:content].blank? | ||
|
|
||
| begin | ||
| # check that the content is well-formed xml | ||
| Nokogiri::XML(params[:content], &:strict) | ||
| rescue Nokogiri::XML::SyntaxError | ||
| raise ArgumentError, 'XML is not well formed!' | ||
| end | ||
| @object.datastreams[params[:id]].content = params[:content] # set the XML to be verbatim as posted | ||
| @object.save | ||
| Argo::Indexer.reindex_pid_remotely(@object.pid) | ||
|
|
||
| respond_to do |format| | ||
| format.any { redirect_to solr_document_path(params[:item_id]), notice: 'Datastream was successfully updated' } | ||
| end | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def show_aspect | ||
| pid = params[:item_id].include?('druid') ? params[:item_id] : "druid:#{params[:item_id]}" | ||
| @obj = Dor.find(pid) | ||
| @response, @document = search_service.fetch pid # this does the authorization | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <div class='btn-group full-view-links' role='group'> | ||
| <%= link_to 'View full Dublin Core', dc_solr_document_path(document.id), title: 'Dublin Core (derived from MODS)', class: 'btn btn-secondary btn-sm', data: { blacklight_modal: 'trigger' } %> | ||
| <%= link_to 'View full Dublin Core', dc_item_datastream_path(document.id), title: 'Dublin Core (derived from MODS)', class: 'btn btn-secondary btn-sm', data: { blacklight_modal: 'trigger' } %> | ||
| <%= link_to 'View MODS', purl_preview_item_url(document.id), title: 'MODS View', class: 'btn btn-secondary btn-sm', data: { blacklight_modal: 'trigger' } %> | ||
| </div> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.