Merge branch 'Sprint43'

Author: weiweishi

app/assets/javascripts/modules/community-logo.js

@@ -0,0 +1,48 @@
+$(document).ready(function(){
+        if ($("#descriptions_display").length){
+                var checkbox = document.getElementById('collection_is_community');
+                var logo_div = document.getElementById('logo');
+                var logo = document.getElementById('collection_logo');
+
+                if (checkbox.checked) {
+                  logo_div.style['display'] = 'block';
+                }
+
+                checkbox.onchange = function() {
+                if(this.checked) {
+                  logo_div.style['display'] = 'block';
+                } else {
+                  logo_div.style['display'] = 'none';
+                }};
+
+                logo.onchange = function() {
+                  validateFiles(logo);
+                };
+
+                function validateFiles(inputFile) {
+                  var maxExceededMessage = "This file exceeds the maximum allowed file size (20 KB)";
+                  var extErrorMessage = "Only image file with extension: .jpg, .jpeg, .gif or .png is allowed";
+                  var allowedExtension = ["jpg", "jpeg", "gif", "png"];
+  
+                  var extName;
+                  var file = inputFile.files[0];
+                  var maxFileSize = $(inputFile).data('max-file-size');
+                  var sizeExceeded = false;
+                  var extError = false;
+  
+                  if (file.size && maxFileSize && file.size > parseInt(maxFileSize)) {sizeExceeded=true;};
+                  extName = file.name.split('.').pop();
+                  if ($.inArray(extName, allowedExtension) == -1) {extError=true;};
+
+                  if (sizeExceeded) {
+                    window.alert(maxExceededMessage);
+                    $(inputFile).val('');
+                  };
+  
+                  if (extError) {
+                    window.alert(extErrorMessage);
+                    $(inputFile).val('');
+                  };
+               }
+        }
+});

app/assets/stylesheets/era_custom.css.scss

@@ -976,6 +976,11 @@ i.glyphicon{
 		background-color: #fff;
 	}
 
+#community-logo img{
+        padding-top: 20%;
+	width: 80%;
+}
+
 /* Upload form */
 .agreement-text {
 	height: 180px;

app/controllers/catalog_controller.rb

@@ -197,15 +197,13 @@ def set_solr_search_fields
         }
       end
 
-      config.add_search_field('date_created') do |field|
+      config.add_search_field('date') do |field|
         field.label = "Date"
-        field.solr_parameters = {
-          :"spellcheck.dictionary" => "date_created"
-        }
-        solr_name = Solrizer.solr_name("created", :stored_searchable)
+        field.solr_parameters = { :"spellcheck.dictionary" => "date_accepted", :"spellcheck.dictionary" => "date_created" }
+        field_included = [Solrizer.solr_name("date_created", :stored_searchable), Solrizer.solr_name("date_accepted", :stored_searchable)].join(" ")
         field.solr_local_parameters = {
-          qf: solr_name,
-          pf: solr_name
+          qf: field_included,
+          pf: field_included
         }
       end
 

app/controllers/concerns/hydranorth/collections/selects_collections.rb

@@ -47,7 +47,11 @@ def find_communities(access_level = nil)
     authenticate_user! unless access_level.blank?
 
     # run the solr query to find the collections
-    query = collections_search_builder(access_level).with({q: '(is_community_bsi:true OR is_community_tesim:true) AND (is_official_bsi:true OR is_official_tesim:true) '}).query
+    if access_level.blank?
+      query = collections_search_builder(access_level).with({q: '(is_community_bsi:true OR is_community_tesim:true) AND (is_official_bsi:true OR is_official_tesim:true) '}).query
+    else
+      query = collections_search_builder(access_level).with({q: '(is_community_bsi:true OR is_community_tesim:true) AND (is_official_bsi:true OR is_official_tesim:true) AND is_admin_set_bsi:false'}).query
+    end
     response = repository.search(query)
     # return the user's collections (or public collections if no access_level is applied)
     # not a fan of sorting this in ruby, but collections search builder doesn't seem to pass on

app/controllers/concerns/hydranorth/collections_controller_behavior.rb

@@ -13,6 +13,24 @@ def show
       presenter
     end
 
+    def update 
+     if params[:collection][:logo]
+       mime_type = params[:collection][:logo].content_type
+       original_filename = params[:collection][:logo].original_filename
+       @collection.add_file(params[:collection][:logo].tempfile, path: 'logo', original_name: original_filename, mine_type: mime_type)
+     end
+     super
+    end
+
+    def create
+     if params[:collection][:logo]
+       mime_type = params[:collection][:logo].content_type
+       original_filename = params[:collection][:logo].original_filename
+       @collection.add_file(params[:collection][:logo].tempfile, path: 'logo', original_name: original_filename, mine_type: mime_type)
+     end
+     super
+    end
+
     protected
 
     # override Sufia::CollectionsControllerBehavior#presenter to establish
@@ -40,6 +58,10 @@ def form_class
 
     protected
 
+    def logo
+      send_data(collection.logo, filename: "image", type: "text/xml", disposition: "inline")
+    end
+    
     # these methods enhacnce hydra-collection's collections_controller_behaviour
 
     def add_members_to_collection collection = nil

app/controllers/concerns/hydranorth/communities_controller_behavior.rb

@@ -13,5 +13,11 @@ module CommunitiesControllerBehavior
 
     def index
     end
+
+    def logo
+      @community = Collection.find(params[:id])
+      send_data @community.logo.content, disposition: 'inline'
+    end
+
   end
 end

app/controllers/concerns/hydranorth/files_controller_behavior.rb

@@ -11,12 +11,6 @@ module FilesControllerBehavior
     include Hydranorth::Breadcrumbs
 
 
-    included do
-      self.edit_form_class = Hydranorth::Forms::GenericFileEditForm
-      self.presenter_class = Hydranorth::GenericFilePresenter
-    end
-
-
     protected
 
     def actor
@@ -27,38 +21,16 @@ def attributes
       attributes = params
     end
 
-    def presenter
-      if @generic_file[:resource_type].include? Sufia.config.special_types['cstr']
-        Hydranorth::CstrPresenter.new(@generic_file)
-      elsif @generic_file[:resource_type].include? Sufia.config.special_types['ser']
-        Hydranorth::SerPresenter.new(@generic_file)
-      elsif @generic_file[:remote_resource] == "dataverse"
-        Hydranorth::DataversePresenter.new(@generic_file)
-      elsif @generic_file[:resource_type].include? Sufia.config.special_types['thesis']
-        Hydranorth::ThesisPresenter.new(@generic_file)
-      else
-        Hydranorth::GenericFilePresenter.new(@generic_file)
-      end
-    end
 
     def edit_form
       find_collections_with_read_access
       find_communities_with_read_access
 
       @community_collections = collections_for_community(@generic_file.belongsToCommunity.first)
 
-      if @generic_file[:resource_type].include? Sufia.config.special_types['cstr']
-        Hydranorth::Forms::CstrEditForm.new(@generic_file)
-      elsif @generic_file[:resource_type].include? Sufia.config.special_types['ser']
-        Hydranorth::Forms::SerEditForm.new(@generic_file)
-      elsif @generic_file[:resource_type].include? Sufia.config.special_types['thesis']
-        Hydranorth::Forms::ThesisEditForm.new(@generic_file)
-      else
-        Hydranorth::Forms::GenericFileEditForm.new(@generic_file)
-      end
+      super
     end
 
-
     def process_file(file)
       Batch.find_or_create(params[:batch_id])
 

app/controllers/generic_files_controller.rb

@@ -21,5 +21,37 @@ def update_collections
     end
   end
 
+  def cstr_resource?
+    @generic_file[:resource_type].include? Sufia.config.special_types['cstr']
+  end
+  
+  def ser_resource?
+    @generic_file[:resource_type].include? Sufia.config.special_types['ser']
+  end
+
+  def dataverse_resource?
+    @generic_file[:remote_resource] == "dataverse" 
+  end
+
+  def thesis_resource?
+    @generic_file[:resource_type].include? Sufia.config.special_types['thesis']
+  end
+
+  def presenter_class
+    super unless @generic_file
+    return Hydranorth::CstrPresenter if cstr_resource?
+    return Hydranorth::SerPresenter if ser_resource?
+    return Hydranorth::DataversePresenter if dataverse_resource?
+    return Hydranorth::ThesisPresenter if thesis_resource?
+    Hydranorth::GenericFilePresenter
+  end
+
+  def edit_form_class
+    super unless @generic_file
+    return Hydranorth::Forms::CstrEditForm if cstr_resource?
+    return Hydranorth::Forms::SerEditForm if ser_resource?
+    return Hydranorth::Forms::ThesisEditForm if thesis_resource?
+    Hydranorth::Forms::GenericFileEditForm
+  end
 
 end

app/models/ability.rb

@@ -18,7 +18,7 @@ def custom_permissions
       end
       cannot :create, ::Collection 
       cannot :destroy, ::Collection unless admin?
-      cannot :manage, ::Collection do |obj|
+      cannot [:edit, :update], ::Collection do |obj|
         obj.is_admin_set?
       end unless admin? 
       can :manage, :all if admin?

app/models/concerns/hydranorth/collection_behavior.rb

@@ -9,9 +9,10 @@ module CollectionBehavior
     include Hydra::Collections::Collectible
     include Hydra::AccessControls::Permissions
     include Hydra::Collections::Metadata
+    include Hydranorth::Collections::Logo
 
     included do
-      before_save :remove_self_from_members, :update_permissions
+      before_save :remove_self_from_members, :update_permissions, :check_logo_size
       validates :title, presence: true
     end
 
@@ -31,6 +32,13 @@ def find_or_create_with_type(resource_type)
         end
       end
     end
+ 
+    def check_logo_size
+      size = logo.size
+      if size.to_i > 200.kilobytes
+        raise "Collection logo larger than 200KB"
+      end
+    end  
 
     def update_permissions
       self.visibility = "open"

app/models/concerns/hydranorth/collections/logo.rb

@@ -0,0 +1,11 @@
+module Hydranorth
+  module Collections
+    module Logo 
+      extend ActiveSupport::Concern
+      included do
+        contains "logo", class_name: 'LogoDatastream'
+      end
+
+    end
+  end
+end

app/models/datastreams/logo_datastream.rb

@@ -0,0 +1,3 @@
+class LogoDatastream < ActiveFedora::File
+  include Sufia::FileContent::Versions
+end

app/views/collections/_form.html.erb

@@ -1,11 +1,20 @@
+<%= javascript_include_tag 'modules/community-logo' %>
 <%= simple_form_for [collections, @form], html: {class: 'form-horizontal editor'} do |f| %>
   <div id="descriptions_display">
-   
+
     <div class="well">
-       <p><small><span class="error">*</span> indicates required fields</small></p>
+      <p><small><span class="error">*</span> indicates required fields</small></p>
+
       <% f.object.terms.each do |term| %>
         <%= render_edit_field_partial term, f: f %>
       <% end %>
+      <br/><br/>
+      <div id="logo" style="display:none">
+        <span style="font-weight:bold">Logo</span>
+        <%= f.label :logo do %>
+          <%= f.file_field :logo, :onchange =>"validateFiles(this);", :data => {:max_file_size => 20.kilobytes} %>
+        <% end %>
+      </div>
     </div><!-- /well -->
   </div>
   <%= hidden_field_tag :type, params[:type] %>

app/views/collections/edit.html.erb

@@ -0,0 +1,25 @@
+<% @page_title = "Edit Collection #{display_title(@collection)} - #{application_name}" %>
+<%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
+<h1>Edit Collection: <%= display_title(@collection) %></h1>
+
+<% unless has_collection_search_parameters? %>
+  <div class="row">
+    <div class="col-xs-12 col-sm-10 pull-right">
+      <%= render 'collections/form' %>
+    </div>
+    <div class="col-xs-12 col-sm-2">
+      <div id="community-logo">
+        <%= image_tag url_for(:controller => 'communities', action: 'logo', id: @collection.id), alt: "No logo" %>
+      </div>
+      <%= render 'collections/edit_actions' %>
+    </div>
+  </div>
+<% end %>
+
+<h2>Manage Items in this Collection</h2>
+<%= render 'search_collection_dashboard_form'%>
+<%= render 'my/did_you_mean' %>
+<%= render 'my/facet_selected' %>
+<%= render 'collections/sort_and_per_page' %>
+<%= render 'document_list', documents: @member_docs, document_list_format: "dashboard" %>
+<%= render 'paginate' %>

app/views/collections/show.html.erb

@@ -10,7 +10,9 @@
       </header>
     </div>
     <div class="col-sm-2">
-      <%= render partial: 'collections/media_display', locals: { generic_file: @collection } %> 
+      <div id="community-logo">
+        <%= image_tag url_for(:controller => 'communities', action: 'logo', id: @collection.id), alt: "No logo" %>
+      </div>
       <% if !current_user.nil? %>
         <% if current_user.admin? %>
           <%= render partial: 'collections/show_actions' %>

app/views/records/edit_fields/_description.html.erb

@@ -1 +1,7 @@
-<%= f.input :description, as: :single_text_with_help, input_html: { rows: '14', type: 'textarea', value: f.object.description.first}, required: false %>
+<%# GenericFile and Collection both use this file because hydra-editor %>
+<%# GenericFile description is expecting multivalued but we only display one for editing %>
+<% if f.object.class.multiple? key %>
+  <%= f.input :description, as: :single_text_with_help, input_html: { rows: '14', type: 'textarea', name: 'generic_file[description][]', value: f.object.description.first } %>
+<% else %>
+  <%= f.input :description, as: :single_text_with_help, input_html: { rows: '14', type: 'textarea' } %>
+<% end %>

app/views/records/edit_fields/_title.html.erb

@@ -1 +1,8 @@
-<%= f.input key, as: :single_field, input_html: { class: 'form-control', value: f.object.title}, required: f.object.required?(key) %>
+<%# GenericFile and Collection both use this file because hydra-editor %>
+<%# GenericFile title is expecting multivalued but we only display one for editing %>
+<% if f.object.class.multiple? key %>
+  <%= f.input key, as: :single_field, input_html: { class: 'form-control', name: 'generic_file[title][]', value: f.object.title }, required: f.object.required?(key) %>
+<% else %>
+  <%= f.input key, as: :single_field, input_html: { class: 'form-control', value: f.object.title}, required: f.object.required?(key) %>
+<% end %>
+

app/views/users/_vitals.html.erb

@@ -0,0 +1,3 @@
+        <i class="glyphicon glyphicon-time"></i> Joined on <%= @user.created_at.to_date.strftime("%b %d, %Y") %> <br />
+        <i class="glyphicon glyphicon-folder-open"></i> Deposited Files
+        <%= link_to number_of_deposits(@user), add_facet_params(Solrizer.solr_name("depositor", :symbol), @user.to_s).merge!(controller: "catalog", action: "index") %> <br />

config/routes.rb

@@ -71,12 +71,12 @@
   get 'batches/:id/update_collections' => 'batch#update_collections', as: 'update_collections'
   get 'files/:id/update_collections' => 'generic_files#update_collections'
   get 'communities', controller: 'communities', action: :index
+  get 'communities/logo', controller: 'communities', action: :logo
   get 'collections/:id/:sort', controller: 'collections', action: :show
   get 'collections/:id/:per_page', controller: 'collections', action: :show
   get 'collections/:id/edit', controller: 'collections', action: :edit
   get 'recent', controller: 'recent', action: :index
 
-
   # This must be the very last route in the file because it has a catch-all route for 404 errors.
   # This behavior seems to show up only in production mode.
   mount Sufia::Engine => '/'

spec/controllers/collections_controller_spec.rb

@@ -153,6 +153,13 @@
         @child_collection.member_ids = [@file2.id]
         @child_collection.save
 
+        @logo_file = fixture_file_upload('logo.jpg', 'image/jpg')
+
+      end
+
+      it "should add logo" do
+        put :update, id: community, collection: {logo: @logo_file}
+        expect(response).to redirect_to routes.url_helpers.collection_path(community)
       end
 
       it "should set belongsToCommunity on member file" do