fcrepo_admin 0.3.2 → 0.3.3

data/README.rdoc

@@ -46,7 +46,7 @@ See https://github.com/projecthydra/hydra-head/wiki/Installation-Prerequisites.
 
 * Customize catalog search results (optional)
 
-  If you would like items from the catalog search results list to the object admin view
+  If you would like catalog search results items to link to the object admin view
   instead of the catalog show view, create app/helpers/blacklight_helper.rb with this content:
 
     module BlacklightHelper

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -3,6 +3,8 @@ require 'mime/types'
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
 
+    include FcrepoAdmin::ControllerBehavior
+
     layout 'fcrepo_admin/datastreams'
 
     # Additional types of content that should be displayed inline
@@ -69,8 +71,7 @@ module FcrepoAdmin
     protected
 
     def inline_filter
-      @inline = @datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)
-      # @inline &&= @datastream.dsSize <= MAX_INLINE_SIZE
+      @inline = (@datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)) && @datastream.dsSize <= MAX_INLINE_SIZE
     end
 
   end

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -1,6 +1,8 @@
 module FcrepoAdmin
   class ObjectsController < ApplicationController
 
+    include FcrepoAdmin::ControllerBehavior
+
     layout 'fcrepo_admin/objects'
     
     PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
@@ -14,10 +16,12 @@ module FcrepoAdmin
     end
 
     def audit_trail
-      # XXX Update when new version of ActiveFedora released
-      @audit_trail = @object.respond_to?(:audit_trail) ? @object.audit_trail : @object.inner_object.audit_trail
-      if params[:download]
-        send_data @audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+      if object_is_auditable?
+        if params[:download]
+          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+        end
+      else
+        render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404
       end
     end
 
@@ -40,11 +44,7 @@ module FcrepoAdmin
     protected
 
     def object_properties
-      unless @object_properties
-        @object_properties = {}
-        PROPERTIES.each { |p| @object_properties[p] = @object.send(p) }
-      end
-      @object_properties
+      @object_properties ||= PROPERTIES.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
     end
 
     def apo_relationship_name

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

@@ -4,6 +4,8 @@
 <li>
   <%= link_to_unless_current t("fcrepo_admin.object.nav.items.summary"), fcrepo_admin.object_path(object) %>
 </li>
+<% if object_is_auditable? %>
 <li>
   <%= link_to_unless_current t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(object) %>
 </li>
+<% end %>

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

@@ -17,7 +17,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		<% @audit_trail.records.each do |record| %>
+		<% @object.audit_trail.records.each do |record| %>
 		<tr>
 			<td><%= record.id %></td>
 			<td><%= record.process_type %></td>

data/config/locales/fcrepo_admin.en.yml

@@ -31,6 +31,7 @@ en:
         enforcement_disabled: 'Admin policy access control enforcement is disabled'
         relationship_undefined: 'This object type does not define an admin policy relationship'
       audit_trail: 
+        not_implemented: 'This object does implement access to the Fedora audit trail (ActiveFedora::Auditable)'
         title: 'Audit Trail'
         download: 'Download'
         record:

data/lib/fcrepo_admin/controller_behavior.rb

@@ -0,0 +1,18 @@
+module FcrepoAdmin
+  module ControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :object_is_auditable?
+    end
+
+    def object_is_auditable?
+      begin
+        @object && @object.is_a?(ActiveFedora::Auditable)
+      rescue
+        false
+      end
+    end
+
+  end
+end

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/internal/app/models/content_model.rb

@@ -9,5 +9,6 @@ class ContentModel < ActiveFedora::Base
   belongs_to :admin_policy, :property => :is_governed_by
 
   include Hydra::ModelMixins::RightsMetadata
+  include ActiveFedora::Auditable
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -289,6 +289,7 @@ files:
 - lib/assets/.gitkeep
 - lib/fcrepo_admin.rb
 - lib/fcrepo_admin/blacklight_helper_behavior.rb
+- lib/fcrepo_admin/controller_behavior.rb
 - lib/fcrepo_admin/datastream_ability.rb
 - lib/fcrepo_admin/engine.rb
 - lib/fcrepo_admin/solr_document_extension.rb
@@ -376,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1491170108417626237
+      hash: -492490096386514261
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25