sufia 4.0.0.beta3 → 4.0.0.beta4

data/app/views/dashboard/_show_partials/_default_details.html.erb

@@ -1,15 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-<div>
-  <dl class="defList">
-    <dt>Date: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "date_t") %></dd>
-    <dt>Title: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "title_t") %></dd>
-    <dt>Document Type: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "medium_t") %></dd>
-    <dt>Location: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "location_t") %></dd>
-    <dt>Date: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "date_t") %></dd>
-  </dl>
-</div>

data/app/views/dashboard/_show_partials/_facets.html.erb

@@ -1,87 +0,0 @@
-<% facets_display_heading ||=  "" %>
-<% # main container for facets/limits menu -%>
-<div id="facets">
-  <h2><%=h facets_display_heading %></h2>
-  <% facet_field_names.each do |solr_fname| %>
-    <div>
-      <% display_facet = @response.facets.detect {|f| f.name == solr_fname} -%>
-      <%#- raise solr_fname.inspect unless display_facet -%>
-      <% if display_facet && display_facet.items.length > 0 %>
-        <h3 class="facet_selected"><%= facet_field_labels[solr_fname] -%></h3>
-        <ul>
-             <% item_counter = 0 %>
-          <% display_facet.items.each do |item| -%>
-            <% if item.hits > 0 %>
-              <% facet_count_for_value = facet_value_hits(@facet_lookup, solr_fname, item.value) %>
-              <% if facet_in_params? solr_fname, item.value %>
-                <li>
-                  <span class="selected"><%= h(item.value) %> (<%= format_num facet_count_for_value %>)</span>
-                  <% link_options = remove_facet_params(solr_fname, item.value, params).merge!({ controller: "catalog", action: "index" }) %>
-                  [<%= link_to 'remove', url_for(link_options), class: 'remove' %>]
-                </li>
-                <% else %>
-                               <%- if item_counter > Blacklight.config[:facet_more_num] - 1 -%>
-                  <li class="more">
-                               <%- else -%>
-                                 <li>
-                               <%- end -%>
-        <h3 class="facet_selected"><%= facet_field_labels[solr_fname] -%></h3>
-        <ul>
-             <% item_counter = 0 %>
-          <% display_facet.items.each do |item| -%>
-            <% if item.hits > 0 %>
-              <% facet_count_for_value = facet_value_hits(@facet_lookup, solr_fname, item.value) %>
-              <% if facet_in_params? solr_fname, item.value %>
-                <li>
-                  <span class="selected"><%= h(item.value) %> (<%= format_num facet_count_for_value %>)</span>
-                  <% link_options = remove_facet_params(solr_fname, item.value, params).merge!({ controller: "catalog", action: "index" }) %>
-                  [<%= link_to 'remove', url_for(link_options), class: 'remove' %>]
-                </li>
-                <% else %>
-                               <%- if item_counter > Blacklight.config[:facet_more_num]-1 -%>
-                  <li class="more">
-                               <%- else -%>
-                                 <li>
-                               <%- end -%>
-                  <% link_options = add_facet_params(solr_fname, item.value).merge!({ controller: "catalog", action: "index" }) %>
-                  <%= link_to h(item.value), url_for(link_options) %> (<%= format_num facet_count_for_value %>)
-                </li>
-              <% end -%>
-            <% end -%>
-                       <% item_counter += 1 %>
-          <% end %>
-          <%= display_facet.items.length >
-Blacklight.config[:facet_more_num] ? "<li class='more_li'><a href=''
-							     class='more_link'
-							     title='more
-							     #{pluralize(2,
-							     facet_field_labels[solr_fname])[2..-1].downcase}'>more<span class='off_screen'>
-		#{pluralize(2,
-		facet_field_labels[solr_fname])[2..-1].downcase}</span></a></li>"
-: "" %>
-          <%= display_facet.items.length >
-Blacklight.config[:facet_more_num] ? "<li class='less_li'
-					  style='display:none;'><a href=''
-								   class='more_link'
-								   title='less
-								   #{pluralize(2,
-								   facet_field_labels[solr_fname])[2..-1].downcase}'>less<span class='off_screen'>
-		#{pluralize(2,
-		facet_field_labels[solr_fname])[2..-1].downcase}</span></a></li>"
-: "" %>
-        </ul>
-      <% end %>
-    </div>
-  <% end %>
-</div>
-<script type="text/javascript">
-  $(".more").toggle();
-  $('.more_link').each(function(){
-    $(this).click(function(){
-      $(this).parent().parent().children("li.more").toggle();
-      $(this).parent().parent().children("li.more_li").toggle();
-      $(this).parent().parent().children("li.less_li").toggle();
-      return false;
-    });
-  });
-</script>

data/app/views/generic_files/_field_display.html.erb

@@ -1,12 +0,0 @@
-  <% vals =  Array(generic_file[key]) %>
-  <tr>
-    <th><%= get_label(key) %></th>
-    <td>
-      <% vals.each do |v| %>
-        <span itemprop="name">
-          <%= v %>
-        </span>
-        <br />
-      <% end %>
-    </td>
-  </tr>

data/spec/controllers/dashboard/files_controller_spec.rb

@@ -1,71 +0,0 @@
-require 'spec_helper'
-
-describe Dashboard::FilesController do
-  describe "logged in user" do
-    before (:each) do
-      @user = FactoryGirl.find_or_create(:archivist)
-      sign_in @user
-    end
-
-    describe "#index" do
-      before do
-        GenericFile.destroy_all
-        Collection.destroy_all
-        @my_file = FactoryGirl.create(:generic_file, depositor: @user)
-        @my_collection = Collection.new(title: "test collection").tap do |c|
-          c.apply_depositor_metadata(@user.user_key)
-        end
-        @my_collection.save!
-        @shared_file = FactoryGirl.build(:generic_file).tap do |r|
-          r.apply_depositor_metadata FactoryGirl.create(:user)
-          r.edit_users += [@user.user_key]
-          r.save!
-        end
-        @unrelated_file = FactoryGirl.create(:generic_file, depositor: FactoryGirl.create(:user))
-        @wrong_type = Batch.create
-      end
-
-      it "should respond with success" do
-        get :index
-        expect(response).to be_successful
-        expect(response).to render_template('dashboard/lists/index')
-      end
-
-      it "sets the controller name" do
-        expect(controller.controller_name).to eq :dashboard
-      end
-
-      it "should paginate" do          
-        FactoryGirl.create(:generic_file)
-        FactoryGirl.create(:generic_file)
-        get :index, per_page: 2
-        expect(assigns[:document_list].length).to eq 2
-        get :index, per_page: 2, page: 2
-        expect(assigns[:document_list].length).to be >= 1
-      end
-
-      it "shows the correct files" do
-        get :index
-        # shows documents I deposited
-        expect(assigns[:document_list].map(&:id)).to include(@my_file.id)
-        # doesn't show collections
-        expect(assigns[:document_list].map(&:id)).to_not include(@my_collection.id)
-        # doesn't show shared files
-        expect(assigns[:document_list].map(&:id)).to_not include(@shared_file.id)
-        # doesn't show other users' files
-        expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_file.id)
-        # doesn't show non-generic files
-        expect(assigns[:document_list].map(&:id)).to_not include(@wrong_type.id)
-      end
-    end
-  end
-
-  describe "not logged in as a user" do
-    describe "#index" do
-      it "should return an error" do
-        get :index
-        expect(response).to be_redirect
-      end
-    end
-  end
-end