fcrepo_admin 0.3.5 → 0.4.0

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

@@ -1,8 +1,9 @@
-<table class="table table-bordered table-condensed">
+<h3><%= t("fcrepo_admin.object.properties.title") %></h3>
+<table class="table" style="width: auto">
   <% object_properties.each do |key, value| %>
-    <tr>
-	  <th scope="row"><%= t("fcrepo_admin.object.properties.keys.#{key}") %></th>
-	  <td><%= value %></td>
-    </tr>
+  <tr>
+	<th scope="row"><%= t("fcrepo_admin.object.properties.keys.#{key}") %>:</th>
+	<td><%= value %></td>
+  </tr>
   <% end %>
 </table>

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

@@ -0,0 +1,5 @@
+<h3><%= t("fcrepo_admin.object.permissions.title") %></h3>
+<%= render :partial => 'direct_permissions', :locals => {:object => @object} %>
+<%= render 'inherited_permissions' %>
+
+

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

@@ -1,46 +1,3 @@
-<div class="tabbable">
-  <ul class="nav nav-tabs">
-    <li class="active"><a href="#tab-datastreams" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.datastreams") %></a></li>
-    <li><a href="#tab-properties" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.properties") %></a></li>
-    <li><a href="#tab-permissions" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.permissions") %></a></li>
-  </ul>
-  <div class="tab-content">
-    <div class="tab-pane active" id="tab-datastreams">
-	  <%= render :partial => 'fcrepo_admin/datastreams/datastreams', :locals => {:datastreams => @object.datastreams} %>
-    </div>
-    <div class="tab-pane" id="tab-properties">
-	  <%= render 'properties' %>
-    </div>
-    <div class="tab-pane" id="tab-permissions">
-	<% if object_has_permissions? %>
-      <h4>Direct Permissions</h4>
-	  <%= render :partial => 'permissions', :locals => {:permissions => @object.permissions} %>
-	  <h4>Inherited Permissions</h4>
-	  <% unless admin_policy_enforcement_enabled? %>
-	    <p class="alert">
-		  <%= t("fcrepo_admin.object.apo.enforcement_disabled") %>.
-	    </p>
-	  <% end %>
-	  <% if object_model_belongs_to_apo? %>
-	    <p>
-		  <%= t("fcrepo_admin.object.apo.governed_by") %>: 
-		  <% if object_has_admin_policy? %>
-		    <%= link_to object_admin_policy.pid, fcrepo_admin.object_path(object_admin_policy) %>
-	      <% else %>
-		    <span class="label"><%= t("fcrepo_admin.object.apo.not_assigned") %></span>
-		  <% end %>
-	    </p>
-		<% if object_has_inherited_permissions? %>
-	      <%= render :partial => 'permissions', :locals => {:permissions => object_inherited_permissions} %>
-		<% end %>
-	  <% else %>
-	    <p class="alert alert-info">
-		  <%= t("fcrepo_admin.object.apo.relationship_undefined") %>: <%= object_type %>.
-	    </p>
-	  <% end %>
-    <% else %>
-	  <%= t("fcrepo_admin.object.permissions.not_supported") %>: <%= object_type %>.
-	<% end %>
-    </div> <!-- /tab-permissions -->
-  </div>
-</div>
+<%= render_document_partial @document, :show %>
+<%= render 'properties' %>
+

data/app/views/layouts/fcrepo_admin/datastreams.html.erb

@@ -4,7 +4,7 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render_object_context_nav %>
-  <%= render_datastream_context_nav %>
+  <%= render 'fcrepo_admin/objects/context_nav' %>
+  <%= render 'fcrepo_admin/datastreams/context_nav' %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

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

@@ -3,6 +3,6 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render_object_context_nav %>
+  <%= render 'fcrepo_admin/objects/context_nav' %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

data/config/locales/fcrepo_admin.en.yml

@@ -5,11 +5,16 @@ en:
         datastreams: 'Datastreams'
         properties: 'Properties'
         permissions: 'Permissions'
+        associations: 'Associations'
       nav:
         header: 'Object Admin'
         items:
-          summary: 'Object Summary'
+          summary: 'Basic View'
           audit_trail: 'Audit Trail'
+          permissions: 'Permissions'
+          properties: 'Properties'
+          datastreams: 'Datastreams'
+          associations: 'Associations'
       properties:
         title: 'Properties'
         keys:
@@ -19,15 +24,28 @@ en:
           modified_date: 'Modified Date'
           label: 'Label'
       permissions:
+        title: 'Permissions'
         no_permissions: 'No permissions.'
         not_supported: 'This object type does not support Hydra permissions'
+        direct: 'Direct Permissions'
+        inherited: 'Inherited Permissions'
         header:
           type: 'Type'
           name: 'Name'
           access: 'Access'
+      associations:
+        title: 'Associations'
+        not_assigned: 'not assigned'
+        collection_target: 'object'
+        header:
+          macro: 'Macro'
+          name: 'Association Name'
+          target: 'Target Object(s)'
+          class_name: 'Target Object Type'
+          property: 'Property/Predicate'
       apo:
-        governed_by: 'Governed By'
-        not_assigned: 'Not Assigned'
+        governed_by: 'Governed by admin policy object'
+        not_assigned: 'This object is not governed by an admin policy object'
         enforcement_disabled: 'Admin policy access control enforcement is disabled'
         relationship_undefined: 'This object type does not define an admin policy relationship'
       audit_trail: 
@@ -44,6 +62,7 @@ en:
           justification: 'Justification'
     datastreams:
       title: 'Datastreams'
+      not_persisted: 'Not persisted'
       header:
         id: 'Datastream ID'
         label: 'Label'
@@ -54,7 +73,8 @@ en:
       nav:
         header: 'Datastream Admin'
         items:
-          summary: 'Datastream Summary'
+          summary: 'Profile'
+          content: 'View Content'
           edit: 'Edit Content'
           upload: 'Upload Content'
           download: 'Download Content'

data/config/routes.rb

@@ -2,9 +2,14 @@ FcrepoAdmin::Engine.routes.draw do
 
   scope :module => "fcrepo_admin" do
     resources :objects, :only => :show do
-      get 'audit_trail', :on => :member
-      resources :datastreams, :only => [:show, :edit, :update] do
+      member do
+        get 'audit_trail'
+        get 'permissions'
+      end
+      resources :associations, :only => [:index, :show]
+      resources :datastreams, :only => [:index, :show, :edit, :update] do
         member do
+          get 'content'
           get 'upload'
           get 'download'
         end

data/lib/fcrepo_admin.rb

@@ -4,16 +4,19 @@ require 'hydra/head'
 
 module FcrepoAdmin
   autoload :SolrDocumentExtension, 'fcrepo_admin/solr_document_extension'
-  autoload :DatastreamAbility, 'fcrepo_admin/datastream_ability'
+  autoload :Ability, 'fcrepo_admin/ability'
   module Helpers
     autoload :BlacklightHelperBehavior, 'fcrepo_admin/helpers/blacklight_helper_behavior'
     autoload :ObjectsHelperBehavior, 'fcrepo_admin/helpers/objects_helper_behavior'
     autoload :DatastreamsHelperBehavior, 'fcrepo_admin/helpers/datastreams_helper_behavior'
+    autoload :AssociationsHelperBehavior, 'fcrepo_admin/helpers/associations_helper_behavior'
     autoload :FcrepoAdminHelperBehavior, 'fcrepo_admin/helpers/fcrepo_admin_helper_behavior'
   end
   module Controller
     autoload :ControllerBehavior, 'fcrepo_admin/controller/controller_behavior'
     autoload :ObjectsControllerBehavior, 'fcrepo_admin/controller/objects_controller_behavior'
     autoload :DatastreamsControllerBehavior, 'fcrepo_admin/controller/datastreams_controller_behavior'
+    autoload :AssociationsControllerBehavior, 'fcrepo_admin/controller/associations_controller_behavior'
+    autoload :CatalogControllerBehavior, 'fcrepo_admin/controller/catalog_controller_behavior'
   end
 end

data/lib/fcrepo_admin/ability.rb

@@ -0,0 +1,18 @@
+module FcrepoAdmin
+  module Ability
+    extend ActiveSupport::Concern
+    
+    included do
+      self.ability_logic += [:fcrepo_admin_aliases]
+    end
+
+    def fcrepo_admin_aliases
+      alias_action :download, :to => :read
+      alias_action :audit_trail, :to => :read
+      alias_action :permissions, :to => :read
+      alias_action :content, :to => :read
+      alias_action :upload, :to => :update
+    end
+
+  end
+end

data/lib/fcrepo_admin/controller/associations_controller_behavior.rb

@@ -0,0 +1,49 @@
+module FcrepoAdmin::Controller
+  module AssociationsControllerBehavior
+    extend ActiveSupport::Concern
+    
+    included do
+      layout 'fcrepo_admin/objects'
+
+      include FcrepoAdmin::Controller::ControllerBehavior
+
+      before_filter :load_and_authorize_object
+      before_filter :load_association, :only => :show
+    end
+
+    def index
+    end
+
+    def show
+      if @association.collection?
+        self.solr_search_params_logic += [:association_filter]
+        @response, @documents = get_search_results({:qt => 'standard'})
+      else
+        target = @object.send("#{@association.name}_id")
+        if target
+          redirect_to :controller => 'objects', :action => 'show', :id => target, :use_route => 'fcrepo_admin'
+        else
+          render :text => "Target not found", :status => 404
+        end
+      end
+    end
+
+    def association_filter(solr_params, user_params)
+      solr_params[:q] = construct_query
+    end
+
+    protected
+
+    # Copied from ActiveFedora::Associations::AssociationCollection
+    def construct_query
+      clauses = {@association.options[:property] => @object.internal_uri}
+      clauses[:has_model] = @association.class_name.constantize.to_class_uri if @association.class_name && @association.class_name != 'ActiveFedora::Base'
+      ActiveFedora::SolrService.construct_query_for_rel(clauses)
+    end
+
+    def load_association
+      @association = @object.reflections[params[:id].to_sym] # XXX raise exception if nil
+    end
+
+  end
+end

data/lib/fcrepo_admin/controller/catalog_controller_behavior.rb

@@ -0,0 +1,9 @@
+module FcrepoAdmin::Controller
+  module CatalogControllerBehavior
+
+    def search_action_url
+      url_for(:controller => '/catalog', :action => 'index', :only_path => true)
+    end
+
+  end
+end

data/lib/fcrepo_admin/controller/controller_behavior.rb

@@ -4,6 +4,25 @@ module FcrepoAdmin::Controller
 
     included do
       helper_method :object_is_auditable?
+      helper_method :object_is_governable?
+      helper_method :object_is_governed_by
+      helper_method :admin_policy_enforcement_enabled?
+    end
+
+    protected
+
+    def load_and_authorize_object
+      load_object
+      authorize_object
+    end
+
+    def load_object
+      id = params[:object_id] || params[:id]
+      @object = ActiveFedora::Base.find(id, :cast => true)
+    end
+
+    def authorize_object
+      authorize! params[:action].to_sym, @object
     end
 
     def object_is_auditable?
@@ -14,5 +33,35 @@ module FcrepoAdmin::Controller
       end
     end
 
+    def admin_policy_enforcement_enabled?
+      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
+      # appears to be the only way that APO access control enforcement can be enabled.
+      self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
+    end
+
+    def object_is_governed_by
+      @object_is_governed_by ||= object_is_governable? && @object.send(is_governed_by_association_name)
+    end
+
+    def object_is_governable?
+      !is_governed_by_association_name.nil?
+    end
+
+    def is_governed_by_association_name
+      @object.reflections.each do |name, reflection|
+        if reflection.macro == :belongs_to && reflection.options[:property] == :is_governed_by # && reflection.class_name == admin_policy_class.to_s
+          return reflection.name
+        end
+      end
+    end
+
+    def admin_policy_class
+      # XXX Ideally we would use Hydra::PolicyAwareAccessControlsEnforcement#policy_class,
+      # but it's only available if it's been included in the application controller, i.e.,
+      # if APO access control enforcement is enabled.  We want to know the name of the
+      # relationship regardless of whether policy enforcement is enabled.
+      Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy)
+    end
+
   end
 end

data/lib/fcrepo_admin/controller/datastreams_controller_behavior.rb

@@ -5,19 +5,31 @@ module FcrepoAdmin::Controller
     extend ActiveSupport::Concern
 
     included do
-      layout 'fcrepo_admin/datastreams'
+      layout 'fcrepo_admin/datastreams', :except => :index
+      layout 'fcrepo_admin/objects', :only => :index
+
       include FcrepoAdmin::Controller::ControllerBehavior
-      before_filter :load_and_authorize_datastream
-      before_filter :inline_filter, :only => [:show, :edit]
+
+      before_filter :load_and_authorize_object
+      before_filter :load_datastream, :except => :index
+
+      helper_method :ds_content_is_text?
+      helper_method :ds_content_is_editable?
     end
 
     # Additional types of content that should be displayed inline
     TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
     MAX_INLINE_SIZE = 1024 * 64
 
+    def index
+    end
+
     def show
     end
 
+    def content
+    end
+
     def download
       mimetypes = MIME::Types[@datastream.mimeType]
       send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
@@ -41,38 +53,19 @@ module FcrepoAdmin::Controller
     end
 
     private
-
-    def load_and_authorize_datastream
-      load_object
-      load_datastream
-      authorize_datastream
-    end
     
-    def load_object
-      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
-    end
-
     def load_datastream
       @datastream = @object.datastreams[params[:id]]
     end
 
-    def authorize_datastream
-      action = case params[:action]
-               when 'upload'
-                 :edit
-               when 'download'
-                 :read
-               else
-                 params[:action].to_sym
-               end
-      # Datastream permissions are solely based on object permissions
-      authorize! action, @object
-    end
-
     protected
 
-    def inline_filter
-      @inline = (@datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)) && @datastream.dsSize <= MAX_INLINE_SIZE
+    def ds_content_is_text?
+      @datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)
+    end
+
+    def ds_content_is_editable?
+      ds_content_is_text? && (@datastream.dsSize <= MAX_INLINE_SIZE)
     end
 
   end

data/lib/fcrepo_admin/controller/objects_controller_behavior.rb

@@ -4,15 +4,19 @@ module FcrepoAdmin::Controller
 
     included do
       layout 'fcrepo_admin/objects'
+
       include FcrepoAdmin::Controller::ControllerBehavior
+
       helper_method :object_properties
-      before_filter :load_and_authorize_object
-      before_filter :load_apo_info, :only => :show
+
+      before_filter :load_and_authorize_object, :except => :show
     end
     
     PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
 
     def show
+      @response, @document = get_solr_response_for_doc_id(params[:id])
+      @object = ActiveFedora::SolrService.reify_solr_results([@document], :load_from_solr => true).first
     end
 
     def audit_trail
@@ -25,20 +29,7 @@ module FcrepoAdmin::Controller
       end
     end
 
-    private
-
-    def load_and_authorize_object
-      load_object
-      authorize_object
-    end
-
-    def load_object
-      @object = ActiveFedora::Base.find(params[:id], :cast => true)
-    end
-
-    def authorize_object
-      action = params[:action] == 'audit_trail' ? :read : params[:action].to_sym
-      authorize! action, @object
+    def permissions
     end
 
     protected
@@ -47,21 +38,5 @@ module FcrepoAdmin::Controller
       @object_properties ||= PROPERTIES.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
     end
 
-    def apo_relationship_name
-      @object.reflections.each_value do |reflection|
-        # XXX This test should also check that reflection class is identical to admin policy class
-        return reflection.name if reflection.options[:property] == :is_governed_by && reflection.macro == :belongs_to
-      end
-      nil
-    end
-
-    def load_apo_info
-      @apo_relationship_name ||= apo_relationship_name
-      @object_admin_policy ||= @apo_relationship_name ? @object.send(@apo_relationship_name) : nil
-      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
-      # appears to be the only way that APO access control enforcement can be enabled.
-      @apo_enforcement_enabled ||= self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
-    end
-
   end
 end