fcrepo_admin 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96f1bb3976444ea4f8397a4e929415d07637a93
-  data.tar.gz: 2a297f927e6d1d723502f857bd4e2fe6947574fd
+  metadata.gz: 73679eaaaef9b035662e7ec5f145669cb75240ad
+  data.tar.gz: 2b63f18ebb6bf30df57796c87c071d2cf0d51d57
 SHA512:
-  metadata.gz: d00acee3472c6f98978af43063abc5d7c47c4dcebbe68cb8ce9327bd32a04a8daf9739a8eee8ddbc0d6178cbdc3b8816283a47e34af514002af8bdee7250cb18
-  data.tar.gz: 80d93b9748fc1021c2128b2076765b5e8640f107ff7ece56b2fa1bb51e555f9be664ac6e32938c0e55340ec36c70918a3891032f659849d6866d8374df46e67e
+  metadata.gz: 47491368bb3881dd03ba9adbce428d4a5858d031dde0bbc8b16163a5026b1ed2d2fad997d11a51bb3101bcc06b312fb9c0268d335a0198a12bf8610255e3ced3
+  data.tar.gz: 07a9a3c5fd32920518feaf74375dc799e6cd0b53a82141c494ee6ff049cd5c4947131f2745e55cb6faca15b06dac72b77fcf77eb4cd24fa9c9fa1cdb5be5d04c

data/HISTORY.rdoc

@@ -1,3 +1,9 @@
+==== 0.5.2 (2013-05-22)
+
+* Fixed association show view pagination by working around Kaminari.
+* Object XML (FOXML) accessible from object context nav.
+* Catalog show fields and show document actions displayed in object show view (summary).
+
 ==== 0.5.1 (2013-05-21)
 
 * Association show view paginated (Fixes #18). 

data/README.rdoc

@@ -120,7 +120,7 @@ Override datastreams helpers by creating app/helpers/fcrepo_admin/datastreams_he
 
 The configuration settings that control the items on the context menus are:
 
-  FcrepoAdmin.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail]
+  FcrepoAdmin.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail, :object_xml]
   FcrepoAdmin.datastream_nav_items = [:dsid, :version, :current_version, :summary, :content, :download, :edit, :upload, :history]
 
 Each setting takes an array of symbols representing the items.  You can start by copying the default values shown above.

data/app/controllers/fcrepo_admin/associations_controller.rb

@@ -12,8 +12,9 @@ module FcrepoAdmin
     end
 
     def show
-      render(:text => "Association not found", :status => 404) if @association.nil?
-      if @association.collection?
+      if @association.nil?
+        render :text => "Association not found", :status => 404
+      elsif @association.collection?
         get_collection_from_solr
       else 
         # This shouldn't normally happen b/c UI links directly to target object view in this case
@@ -39,9 +40,9 @@ module FcrepoAdmin
     end
 
     def collection_query_args
-      page = params[:page] ||= 1
+      page = params[:page].blank? ? 1 : params[:page].to_i
       rows = FcrepoAdmin.associated_objects_per_page
-      start = (page.to_i - 1) * rows
+      start = (page - 1) * rows
       args = {raw: true, start: start, rows: rows}
       apply_gated_discovery(args, nil) # add args to enforce Hydra access controls
       args

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -6,15 +6,19 @@ module FcrepoAdmin
     include FcrepoAdmin::Controller::ControllerBehavior
 
     before_filter :load_and_authorize_object
-    before_filter :load_solr_document, :only => :show
     
     def show
+      respond_to do |format|
+        format.html { load_solr_document }
+        format.xml { render :xml => @object.object_xml }
+      end
     end
 
     def audit_trail
       if @object.auditable?
-        if params[:download] # TODO use format instead download param
-          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+        respond_to do |format|
+          format.html
+          format.xml { render :xml => @object.audit_trail.to_xml }
         end
       else
         render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404

data/app/views/fcrepo_admin/associations/_pagination.html.erb

@@ -0,0 +1,7 @@
+<ul>
+  <li class="<% if pagination_info.current_page == 1 %>disabled<% end %>"><a href="?page=<%= pagination_info.current_page - 1 %>">&laquo;</a></li>
+  <% (1..pagination_info.num_pages).each do |n| %>
+    <li class="<% if n == pagination_info.current_page %>active<% end %>"><a href="?page=<%= n %>"><%= n %></a></li>
+  <% end %>
+  <li class="<% if pagination_info.current_page == pagination_info.num_pages %>disabled<% end %>"><a href="?page=<%= pagination_info.current_page + 1 %>">&raquo;</a></li>
+</ul>

data/app/views/fcrepo_admin/associations/show.html.erb

@@ -9,7 +9,7 @@
   <%= render :partial => 'catalog/document_list', :locals => {:documents => @documents} %>
   <% if @response.total > associated_objects_per_page %>
     <div class="pagination">
-      <%= paginate_rsolr_response @response, :layout => 'blacklight' %>
+      <%= render :partial => 'pagination', :locals => {:pagination_info => paginate_params(@response)} %>
     </div>
   <% end %>
 <% else %>

data/app/views/fcrepo_admin/catalog/_document.html.erb

@@ -1,6 +1,4 @@
-<% # container for a single doc -%>
-<div class="document <%= render_document_class document %>">      
-  <%= render :partial => 'document_header', :locals => { :document => document, :document_counter => document_counter } %>
-  <%# main container for doc partial view -%>
-  <%= render_document_partial document, :index %>
+<div class="document <%= render_document_class document %>">
+  <%= render :partial => 'catalog/document_header', :locals => { :document => document, :document_counter => document_counter } %>
+  <%= render :partial => 'catalog/index_default', :locals => {:document => document} %>
 </div>

data/app/views/fcrepo_admin/catalog/_document_header.html.erb

@@ -0,0 +1,7 @@
+<% # header bar for doc items in index view -%>
+<div class="documentHeader clearfix">        
+  <% # main title container for doc partial view -%>
+  <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+  <% # bookmark functions for items/docs -%>
+  <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
+</div>

data/app/views/fcrepo_admin/objects/audit_trail.html.erb

@@ -1,7 +1,7 @@
 <h3><%= t("fcrepo_admin.object.audit_trail.title") %></h3>
 
 <p>
-	<%= link_to t("fcrepo_admin.object.audit_trail.download"), "#{fcrepo_admin.audit_trail_object_path(@object)}?download=true", :class => "btn btn-primary" %>
+	<%= link_to t("fcrepo_admin.object.audit_trail.download"), fcrepo_admin.audit_trail_object_path(@object, :format => 'xml'), :class => "btn btn-primary" %>
 </p>
 
 <table class="table table-bordered table-condensed table-striped">

data/app/views/fcrepo_admin/objects/show.html.erb

@@ -1,5 +1,10 @@
-<div class="row">
-   <%= render_document_partial @document, :show %>
+<div class="document row">
+  <div class="span7">
+	<%= render :partial => 'catalog/show_default', :locals => {:document => @document} %>
+  </div>
+  <div class="span2">
+    <%= render_show_doc_actions @document %>
+  </div>
 </div>
 <div class="row">
   <div class="span5">

data/config/locales/fcrepo_admin.en.yml

@@ -9,6 +9,7 @@ en:
           permissions: 'Permissions'
           datastreams: 'Datastreams'
           associations: 'Associations'
+          object_xml: 'Object XML'
       properties:
         title: 'Properties'
         keys:

data/lib/fcrepo_admin/configurable.rb

@@ -37,7 +37,7 @@ module FcrepoAdmin::Configurable
 
     # Object context navigation items
     mattr_accessor :object_nav_items
-    self.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail, :bookmark]
+    self.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail, :object_xml]
 
     # Datastream profile values to display on object show view
     mattr_accessor :object_show_datastream_columns

data/lib/fcrepo_admin/decorators/active_fedora/base_decorator.rb

@@ -27,5 +27,10 @@ ActiveFedora::Base.class_eval do
       return reflection if reflection.macro == :belongs_to && reflection.options[:property] == :is_governed_by
     end
   end
+
+  def object_xml
+    # XXX https://github.com/projecthydra/rubydora/pull/26
+    inner_object.repository.object_xml(:pid => pid)
+  end
   
 end

data/lib/fcrepo_admin/helpers/objects_helper_behavior.rb

@@ -60,8 +60,7 @@ module FcrepoAdmin::Helpers
       when item == :permissions  then link_to_object item, @object.has_permissions? && can?(:permissions, @object)
       when item == :associations then link_to_object item
       when item == :audit_trail  then link_to_object item, @object.auditable? && can?(:audit_trail, @object)
-      when item == :bookmark
-        render(:partial => 'catalog/bookmark_control', :locals => {:document=> @document}) if @document
+      when item == :object_xml   then link_to_object item
       else custom_object_nav_item item
       end
     end
@@ -79,6 +78,7 @@ module FcrepoAdmin::Helpers
              when view == :permissions  then fcrepo_admin.permissions_object_path(@object)
              when view == :associations then fcrepo_admin.object_associations_path(@object)
              when view == :audit_trail  then fcrepo_admin.audit_trail_object_path(@object)
+             when view == :object_xml   then fcrepo_admin.object_path(@object, :format => 'xml')
              end
       link_to_unless_current label, path
     end

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/features/objects/audit_trail.html.erb_spec.rb

@@ -6,6 +6,7 @@ describe "audit_trail.html.erb" do
   it "should display the audit trail" do
     visit fcrepo_admin.audit_trail_object_path(object)
     page.should have_content(object.pid)
-    page.should have_link(I18n.t("fcrepo_admin.object.audit_trail.download"), :href => "#{fcrepo_admin.audit_trail_object_path(object)}?download=true")
+    page.should have_link(I18n.t("fcrepo_admin.object.audit_trail.download"), :href => fcrepo_admin.audit_trail_object_path(object, :format => 
+'xml'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - David Chandek-Stark
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -250,10 +250,11 @@ files:
 - app/mailers/.gitkeep
 - app/models/.gitkeep
 - app/views/fcrepo_admin/associations/_associations.html.erb
-- app/views/fcrepo_admin/associations/_document_header.html.erb
+- app/views/fcrepo_admin/associations/_pagination.html.erb
 - app/views/fcrepo_admin/associations/index.html.erb
 - app/views/fcrepo_admin/associations/show.html.erb
 - app/views/fcrepo_admin/catalog/_document.html.erb
+- app/views/fcrepo_admin/catalog/_document_header.html.erb
 - app/views/fcrepo_admin/datastreams/_active_fedora.html.erb
 - app/views/fcrepo_admin/datastreams/_alert.html.erb
 - app/views/fcrepo_admin/datastreams/_content.html.erb

data/app/views/fcrepo_admin/associations/_document_header.html.erb

@@ -1,12 +0,0 @@
-     
-      <% # header bar for doc items in index view -%>
-      <div class="documentHeader clearfix">
-        
-        <% # main title container for doc partial view -%>
-          <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
-
-        
-        <% # bookmark functions for items/docs -%>
-        <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
-      </div>
-