hydra-head 3.3.0 → 4.0.0.rc2

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -31,48 +31,23 @@ module Hydra
     def linked_label(field, field_string)
       link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
     end
-    def link_to_document(doc, opts={:label=>Blacklight.config[:index][:show_link].to_sym, :counter => nil,:title => nil})
-      label = case opts[:label]
-        when Symbol
-          doc.fetch(opts[:label], "")
-        when String
-          opts[:label]
-        else
-          raise 'Invalid label argument'
-        end
-
-      if label.blank?
-        label = doc[:id]
-      end
-      
-      link_to_with_data(label, catalog_path(doc[:id]), {:method => :put, :data => {:counter => opts[:counter]},:title=>opts[:title]})
-    end
 
     # currently only used by the render_document_partial helper method (below)
     def document_partial_name(document)
-      return if document[Blacklight.config[:show][:display_type]].nil?
-      document[Blacklight.config[:show][:display_type]].first.gsub(/^[^\/]+\/[^:]+:/,"").underscore.pluralize
+      display_type = document[blacklight_config.show.display_type]
+
+      return 'default' unless display_type 
+
+      display_type.first.gsub(/^[^\/]+\/[^:]+:/,"").underscore.pluralize
     end
-    
-    # Overriding Blacklight's render_document_partial
-    # given a doc and action_name, this method attempts to render a partial template
-    # based on the value of doc[:format]
-    # if this value is blank (nil/empty) the "default" is used
-    # if the partial is not found, the "default" partial is rendered instead
-    def render_document_partial(doc, action_name, locals={})
-      format = document_partial_name(doc)
-      begin
-        Rails.logger.debug("attempting to render #{format}/_#{action_name}")
-        render :partial=>"#{format}/#{action_name}", :locals=>{:document=>doc}.merge(locals)
-      rescue ActionView::MissingTemplate
-        Rails.logger.debug("rendering default partial catalog/_#{action_name}_partials/default")
-        render :partial=>"catalog/_#{action_name}_partials/default", :locals=>{:document=>doc}.merge(locals)
-      end
+
+    def document_partial_path_templates
+      ["%2$s/%1$s"] + super
     end
     
     # Removing the [remove] link from the default selected facet display
     def render_selected_facet_value(facet_solr_field, item)
-      content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected")
+      content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected label")
     end
 
     
@@ -82,10 +57,10 @@ module Hydra
     
     def render_facet_value(facet_solr_field, item, options ={})
       if item.is_a? Array
-        link_to_unless(options[:suppress_link], item[0], add_facet_params_and_redirect(facet_solr_field, item[0]), :class=>"facet_select") + " (" + format_num(item[1]) + ")" 
-      else
-        link_to_unless(options[:suppress_link], item.value, add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " (" + format_num(item.hits) + ")" 
+        return link_to_unless(options[:suppress_link], item[0], add_facet_params_and_redirect(facet_solr_field, item[0]), :class=>"facet_select") + " (" + format_num(item[1]) + ")" 
       end
+
+      super
     end
 
     def render_complex_facet_value(facet_solr_field, item, options ={})    
@@ -176,24 +151,11 @@ module Hydra
     # Change the action to 'index' to send them back to
     # catalog/index with their new facet choice. 
     def add_facet_params_and_redirect(field, value)
-      new_params = add_facet_params(field, value)
-
-      # Delete page, if needed. 
-      new_params.delete(:page)
+      new_params = super
 
       # Delete :qt, if needed - added to resolve NPE errors
       new_params.delete(:qt)
 
-      # Delete any request params from facet-specific action, needed
-      # to redir to index action properly. 
-      Blacklight::Solr::FacetPaginator.request_keys.values.each do |paginator_key| 
-        new_params.delete(paginator_key)
-      end
-      new_params.delete(:id)
-
-      # Force action to be index. 
-      new_params[:action] = "index"
-
       new_params
     end
 

data/app/helpers/hydra/downloads_helper_behavior.rb

@@ -6,7 +6,7 @@ module Hydra
              
       datastreams.each_value do |ds|
         result << "<li>"
-        result << link_to(ds.label, asset_downloads_path(ds.pid, :download_id=>ds.dsid))
+        result << link_to(ds.label, hydra_asset_downloads_path(ds.pid, :download_id=>ds.dsid))
         result << "</li>"     
       end
           

data/app/helpers/hydra/hydra_assets_helper_behavior.rb

@@ -1,7 +1,5 @@
-require 'mediashelf/active_fedora_helper'
 require 'sanitize'
 module Hydra::HydraAssetsHelperBehavior
-  include MediaShelf::ActiveFedoraHelper
 
   # Create a link for creating a new asset of the specified content_type
   # If user is not logged in, the link leads to the login page with appropriate redirect params for creating the asset after logging in
@@ -9,7 +7,7 @@ module Hydra::HydraAssetsHelperBehavior
   # @param [String] content_type 
   def link_to_create_asset(link_label, content_type)
     if current_user
-      link_to link_label, {:action => 'new', :controller => 'assets', :content_type => content_type}, :class=>"create_asset"
+      link_to link_label, new_hydra_asset_path( :content_type => content_type), :class=>"create_asset"
     else      
       link_to link_label, new_user_session_path(:redirect_params => {:action => "new", :controller=> "assets", :content_type => content_type}), :class=>"create_asset"
     end
@@ -22,8 +20,8 @@ module Hydra::HydraAssetsHelperBehavior
   end
 
   def document_type(document)
-    if (document[Blacklight.config[:show][:display_type]]) 
-      document[Blacklight.config[:show][:display_type]].first.gsub("info:fedora/afmodel:","")
+    if (document[blacklight_config.show.display_type]) 
+      document[blacklight_config.show.display_type].first.gsub("info:fedora/afmodel:","")
     else ""
     end
   end
@@ -41,7 +39,8 @@ module Hydra::HydraAssetsHelperBehavior
 
   def get_file_asset_count(document)
     count = 0
-    obj = load_af_instance_from_solr(document)
+    obj = ActiveFedora::Base.load_instance_from_solr(document['id'], document)
+    #obj = load_af_instance_from_solr(document)
     count += obj.file_objects.length unless obj.nil?
     count
   end

data/app/helpers/hydra/hydra_fedora_metadata_helper_behavior.rb

@@ -1,6 +1,5 @@
 require "inline_editable_metadata_helper"
 require "block_helpers"
-require "active_support"
 require "redcloth" # Provides textile parsing support for textile_area method
 
 module Hydra::HydraFedoraMetadataHelperBehavior

data/app/helpers/hydra/hydra_helper_behavior.rb

@@ -150,7 +150,7 @@ module Hydra::HydraHelperBehavior
     end
   
   def render_previous_workflow_steps
-    "#{previous_show_partials(params[:wf_step]).map{|partial| render partial}}"
+    previous_show_partials(params[:wf_step]).map{|partial| render partial}.join
   end
   
   def render_submission_workflow_step

data/app/helpers/hydra/hydra_uploader_helper_behavior.rb

@@ -3,7 +3,7 @@ module Hydra::HydraUploaderHelperBehavior
   # Generate the appropriate url for posting uploads to
   # Uses the +container_id+ method to figure out what container uploads should go into
   def upload_url
-    upload_url = asset_file_assets_path(:asset_id=>container_id)
+    upload_url = hydra_asset_file_assets_path(:asset_id=>container_id)
   end
   
   # The id of the container that uploads should be posted into

data/app/models/mods_asset.rb

@@ -13,5 +13,9 @@ class ModsAsset < ActiveFedora::Base
   
   # adds helpful methods for basic hydra objects
   include Hydra::ModelMethods
+
+  # adds file_objects methods
+  include ActiveFedora::FileManagement
+
   
 end

data/app/models/role_mapper.rb

@@ -2,8 +2,8 @@ require 'yaml'
 class RoleMapper
   @@map = YAML.load(File.open(File.join(Rails.root, "config/role_map_#{Rails.env}.yml")))
   m = Hash.new{|h,k| h[k]=[]}
-  @@byname = @@map.inject(m) do|memo, k| 
-    k.last.each { |x| memo[x]<<k.first}
+  @@byname = @@map.inject(m) do|memo, (role,usernames)| 
+    ((usernames if usernames.respond_to?(:each)) || [usernames]).each { |x| memo[x]<<role}
     memo
   end
   class << self

data/app/views/catalog/_document_list.html.erb

@@ -3,9 +3,9 @@
   <% facet_name = grouping_facet %>
   <%- if facet_name -%>
     <%- @response.docs.group_by {|d| d[facet_name]}.each do |grouping| -%>
-      <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1], :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
+      <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1].map { |x| SolrDocument.new(x) }, :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
     <%- end -%>
   <%- else -%>
-    <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs, :facet_name => nil, :facet_value => nil} %>
+    <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_name => nil, :facet_value => nil} %>
   <%- end -%>
 </div>

data/app/views/catalog/_edit_partials/_default.html.erb

@@ -52,7 +52,7 @@
         </dd>
   </dl>
 
-  <%= render :partial => "permissions/index", :locals => {:document => document, :asset_id=>params[:id]}%>
+  <%= render :partial => "hydra/permissions/index", :locals => {:document => document, :asset_id=>params[:id]}%>
 
 </div>
 

data/app/views/catalog/_edit_partials/_default_details.html.erb

@@ -1,7 +1,7 @@
 
 
 <%# this should imitate the stuff in catalog/_show_partials/_default_details -%>
-<%= form_tag url_for(:action=>"update", :controller=>"assets"), :id=>"document_metadata"  "accept-charset"=>"utf-8" do %>
+<%= form_tag hydra_update_url_for(:action=>"update", :controller=>"hydra/assets"), :id=>"document_metadata"  "accept-charset"=>"utf-8" do %>
 
   <div id="multipleEdit">
       <dl class="defList fl-theme-mist">

data/app/views/catalog/_index_partials/_default.html.erb

@@ -1,6 +1,6 @@
 <tr class="document <%= cycle("even","odd") %>">
   <td>
-    <%= link_to_document(document, :label => Blacklight.config[:show][:heading].to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
+    <%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
   </td>
   <td>
 

data/app/views/catalog/_show_partials/_default.html.erb

@@ -22,4 +22,4 @@
   <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
 <% end %>
 
-<%= async_load_tag(asset_downloads_path(params[:id]), 'downloads') %>
+<%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>

data/app/views/contributors/_add_contributor_split_button.html.erb

@@ -3,8 +3,8 @@
   <input id="re-run-add-contributor-action" type="button" value="Add a researcher" style="display:none"/>
   <button id="select-contributor-type" type="button" style="display:none">Select type of contributor to add</button>
   <ul id="add-contributor-menu">
-    <li id="add_person"><%= link_to "Add a Person", new_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"person") %></li>
-    <li id="add_organization"><%= link_to "Add an Organization", new_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"organization") %></li>
-    <li id="add_conference"><%= link_to "Add a Conference", new_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"conference") %></li>
+    <li id="add_person"><%= link_to "Add a Person", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"person") %></li>
+    <li id="add_organization"><%= link_to "Add an Organization", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"organization") %></li>
+    <li id="add_conference"><%= link_to "Add a Conference", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"conference") %></li>
   </ul>
-</div>
+</div>

data/app/views/contributors/_edit_conference.html.erb

@@ -22,7 +22,7 @@
       </ul>
       <% if params[:action] == "edit" && !conference_name.empty? %>
         <%= field_selectors_for("descMetadata", [{:person=>conference_counter}]).html_safe %>
-        <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "conference", conference_counter) %>" title="Delete '<%= conference_name %>"> Delete</a>
+        <a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "conference", conference_counter) %>" title="Delete '<%= conference_name %>"> Delete</a>
       <% end %>
     </dd>
   </dl>

data/app/views/contributors/_edit_organization.html.erb

@@ -22,7 +22,7 @@
     </ul>
     <% if (params[:action] == "edit" && !organization_name.empty?) %>
       <%= field_selectors_for("descMetadata", [{:person=>organization_counter}]).html_safe %>
-      <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>"> Delete</a>
+      <a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>"> Delete</a>
     <% end %>
   </dd>
 </dl>

data/app/views/contributors/_edit_person.html.erb

@@ -33,7 +33,7 @@
 
       <% if ( (person_counter > 0) && (params[:action] == "edit" || params[:action] == "create")) %>
         <p class="delete-person"><%#= field_selectors_for("descMetadata", [{:person=>person_counter}]) %>
-          <%= link_to("Delete", asset_connect_path(:asset_id=>@document_fedora.pid, :contributor_type=>"person", :index=>person_counter, :content_type=>af_model), :title=>"Delete #{person_name}", :class=>"destructive destroy_contributor") %>
+          <%= link_to("Delete", hydra_asset_connect_path(:asset_id=>@document_fedora.pid, :contributor_type=>"person", :index=>person_counter, :content_type=>af_model), :title=>"Delete #{person_name}", :class=>"destructive destroy_contributor") %>
         </p>
       <% end %>
   </fieldset>

data/app/views/contributors/_index.html.erb

@@ -3,9 +3,9 @@
 
 <%= render :partial=>"contributors/edit_person", :collection=>person_collection, :locals=>{:af_model => "mods_asset"} %>
 
-<p id="add_author" class="add-multi"><%#= link_to "Add a Person", new_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"person") %></p>
+<p id="add_author" class="add-multi"><%#= link_to "Add a Person", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"person") %></p>
 
 <%#= render :partial=>"contributors/edit_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
 
-<!--<p id="add_organization" class="add-multi"><%#= link_to "Add an Organization", new_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"organization") %></p>-->
+<!--<p id="add_organization" class="add-multi"><%#= link_to "Add an Organization", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"organization") %></p>-->
 

data/app/views/contributors/_show_organization.html.erb

@@ -15,7 +15,7 @@
     <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart]).first %>
 
     <% if (params[:action] == "edit" && !organization_name.empty?) %>
-        <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>">Delete</a>
+        <a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>">Delete</a>
     <% end %>
 </li>
-<% end %>
+<% end %>

data/app/views/contributors/new.html.erb

@@ -4,11 +4,11 @@
   <%# Calculating the new index so all field values (ie first name & last name) will be added to one contributor with that index %>
   <%- new_contributor_index = @document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(ct.to_sym).length %>
   
-  <%= form_tag url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset", :id=>params[:asset_id]), :id=>"add_contributor", "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8" do %>
+  <%= form_tag url_for(:action=>"update", :controller=>"hydra/assets", :content_type=>"mods_asset", :id=>params[:asset_id]), :id=>"add_contributor", "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8" do %>
       <input name="_method" type="hidden" value="put" />  
-      <%= render :partial=>"contributors/edit_#{ct}.html", :locals=>{"edit_#{ct}".to_sym =>{}, "edit_#{ct}_counter".to_sym =>new_contributor_index}  %>
+      <%= render :partial=>"contributors/edit_#{ct}", :locals=>{"edit_#{ct}".to_sym =>{}, "edit_#{ct}_counter".to_sym =>new_contributor_index}  %>
       <%= submit_tag "Add #{ct.capitalize}", {:id => "addContributor"} %> 
   <% end %>
 <%- else %>
-  <%= render :partial=>"contributors/new.html"  %>
-<%- end %>
+  <%= render :partial=>"contributors/new"  %>
+<%- end %>

data/app/views/generic_content_objects/_description_form.html.erb

@@ -1,7 +1,7 @@
-<%= form_tag(url_for(:controller=>"assets", :action=>"update", :id=>params[:id]), :id=>"descriptive-metadata", :"data-resourceType"=>"mods_asset", :"accept-charset"=>"utf-8") do -%>
+<%= form_tag(url_for(:controller=>"hydra/assets", :action=>"update", :id=>params[:id]), :id=>"descriptive-metadata", :"data-resourceType"=>"mods_asset", :"accept-charset"=>"utf-8") do -%>
   <%= hidden_field_tag("_method","put") %>
   <%= render "generic_content_objects/edit_description" %>
   <%= hidden_field_tag(:wf_step, params[:wf_step]) %>
   <%= hidden_field_tag(:content_type,"generic_content") %>
   <%= submit_tag("Continue", :name=>"continue") %>
-<%- end -%>
+<%- end -%>

data/app/views/generic_contents/_index.html.erb

@@ -1,6 +1,6 @@
 <tr class="document <%= cycle("even","odd") %>">
   <td>
-		<%= link_to_document(document, :label => Blacklight.config[:show][:heading].to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>		
+		<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>		
   </td>
   <td>
     <% creator = get_person_from_role(document, "Creator") %>

data/app/views/generic_images/_edit.html.erb

@@ -8,12 +8,12 @@
 		
     <h2 class="section-title">Upload Content</h2>
     <div id="uploads">
-      <%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets} %>
+      <%= render :partial => "hydra/file_assets/index", :locals => { :file_assets => @file_assets} %>
 	  </div>
 
     <h2 class="section-title">Set Permissions</h2>
     <div id="permissions_editor">
-      <%= render :partial => "permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
+      <%= render :partial => "hydra/permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
     </div>
   
     <%#

data/app/views/generic_images/_index.html.erb

@@ -2,7 +2,7 @@
   <td>
 		<img width="75" src="<%= datastream_disseminator_url(document[:id], "thumbnail") %>" alt="thumb">
 
-		<%= link_to_document(document, :label => Blacklight.config[:show][:heading].to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
+		<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
 		
   </td>
   <td>

data/app/views/{file_assets → hydra/file_assets}/_file_assets_form.html.erb

@@ -1,5 +1,5 @@
-<%- if params.has_key?(:number_of_files) or !@file_assets.hits.empty? -%>
-  <%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets } %>
+<%- if params.has_key?(:number_of_files) or !@file_assets.empty? -%>
+  <%= render :partial => "hydra/file_assets/index", :locals => { :file_assets => @file_assets } %>
 <%- end -%>
 <%= form_tag(upload_url, :class => "step") do -%>
   <%= label_tag "number_of_files", "Number of files add" %>
@@ -8,4 +8,4 @@
   <%= hidden_field_tag(:new_asset, true, :id => "num_files_new_asset") if params[:new_asset] %>
   <%= hidden_field_tag("id",params[:id], :id => "file_assets_id")%>
   <%= submit_tag(submit_name, :name=>"continue")%>
-<%- end -%>
+<%- end -%>

data/app/views/{file_assets → hydra/file_assets}/_index.html.erb

@@ -1,9 +1,9 @@
-<% unless file_assets.hits.empty? %>
+<% unless file_assets.empty? %>
     <table class='multipleEdit' id='file_assets'>
       <tr>
         <th colspan="2">File</th>
       </tr>
-      <%= render :partial=>'file_assets/result', :collection=> file_assets.hits %>
+      <%= render :partial=>'hydra/file_assets/result', :collection=> file_assets%>
 			</table>
 <% end %>
 
@@ -15,7 +15,7 @@
       <input type="hidden" name="container_id" value="<%=h container_id %>"/>
       <%= hidden_field_tag("container_content_type", container_content_type, :id => "file_upload_content_type") if defined?(container_content_type) %>
       <%- params[:number_of_files].to_i.times do -%>
-        <%= render :partial=>"file_assets/new"%>
+        <%= render :partial=>"hydra/file_assets/new"%>
       <%- end -%>
       <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "files_wf_step") %>
       <%= hidden_field_tag(:new_asset, true, :id => "files_new_asset") if params[:new_asset] %>

data/app/views/{file_assets → hydra/file_assets}/_result.html.erb

@@ -1,6 +1,6 @@
 <tr class="file_asset" id ="assets_<%= format_pid(result["id"]) %>" >  
   <td>
-    <%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %>
+    <%= link_to result[solr_name("title", :text)], hydra_file_asset_path(result["id"]) %>
   </td>
   <td>
 	

data/app/views/{file_assets → hydra/file_assets}/index.html.erb

@@ -2,4 +2,4 @@
 		Probably should eventually go away. 
 %> 
 <%# @solr_result.hits %>
-<%= render :partial=>'file_assets/index', :locals => { :file_assets => @solr_result }  %>
+<%= render :partial=>'hydra/file_assets/index', :locals => { :file_assets => @solr_result }  %>

data/app/views/{permissions → hydra/permissions}/_index.html.erb

@@ -42,5 +42,5 @@
           <% choice_name = choice.values.first %>
           <% individual_permissions[choice_name] = get_values_from_datastream(@document_fedora,"rightsMetadata", ["#{choice_name}_access".to_sym, :person]) %>
         <% end %>
-        <%= render :partial=>"permissions/edit_person_permissions.html", :collection=>@document_fedora.datastreams["rightsMetadata"].find_by_terms(:access, :person) %>
+        <%= render :partial=>"hydra/permissions/edit_person_permissions", :collection=>@document_fedora.datastreams["rightsMetadata"].find_by_terms(:access, :person) %>
   </fieldset>

data/app/views/{permissions → hydra/permissions}/_permissions_form.html.erb

@@ -1,7 +1,6 @@
 <%- if params.has_key?(:add_permission) -%>
-  <%#= render :partial=>"permissions/new.html", :locals=>{:asset_id=>asset_id} %>
-  <%= form_tag({:controller=>"permissions", :action=> "create", :asset_id=>params[:id]}, :class => "step") do -%>
-    <%= render :partial=>"permissions/new.html" %>
+  <%= form_tag({:controller=>"hydra/permissions", :action=> "create", :asset_id=>params[:id]}, :class => "step") do -%>
+    <%= render :partial=>"hydra/permissions/new" %>
     <%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
     <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
     <%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
@@ -12,8 +11,8 @@
     <% end %>
   <%- end -%>
 <%- else -%>
-  <%= form_tag({:controller=>"permissions", :action => "update"}, :id => "permissions_metadata", :class => "step") do -%>
-    <%= render :partial => "permissions/index" %>
+  <%= form_tag({:controller=>"hydra/permissions", :action => "update"}, :id => "permissions_metadata", :class => "step") do -%>
+    <%= render :partial => "hydra/permissions/index" %>
     <%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
     <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
     <%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
@@ -21,4 +20,4 @@
     <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
     <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
   <%- end -%>
-<%- end -%>
+<%- end -%>