curate 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa358950a239086a07e5b88759c3eaedda3e6c1
-  data.tar.gz: 5e456c912433755c7efd0eb7deba3143ecde8117
+  metadata.gz: d16229a634b02fcd379db96b59ec390e149d4025
+  data.tar.gz: a652c0cf91956f207980021446c960510d0d8b25
 SHA512:
-  metadata.gz: fb47c5e65196b02aa49c6cb0758f551b58b84b0cb26c09bc26570aaca675cdc518146f6e898c544ffa1f60f27a44f274f844f524b600597c2ee1cc9b9aa543ea
-  data.tar.gz: 021f90b2c9a230eb6b56322ee15ef5d9a0d85a38c6e8a787aceaad95d33c7c6d09294403e43413b1a11acd603246896e42e11057f132ec7e9516070787812385
+  metadata.gz: 6258158dff771a3b4bb86a4ccad43c2755ba002fd60159720b7374ef805dd4e40a2aac427efbf056ce945c48fa5a83380e440a18af0d8d1f1c68d686d739ad1d
+  data.tar.gz: 5fe52d8c8eec3e18d43fa5887756aa59148fc8fa9449a8ce186fa34ce2af6219e2e40fbb523138d0602f6de2731124ba6cb70c8dd1093279f3d91e6c95e3f88e

data/Rakefile

@@ -24,4 +24,13 @@ Dir.glob('tasks/*.rake').each { |r| import r }
 
 Bundler::GemHelper.install_tasks
 
+if !ENV['TRAVIS']
+  require 'rspec/yenta'
+  RSpec::Yenta.load_tasks do
+    require File.expand_path("../spec/internal/config/environment.rb",  __FILE__)
+    require File.expand_path('../spec/matchers', __FILE__)
+  end
+  task :yenta => 'generate'
+end
+
 task :default => 'ci'

data/app/assets/javascripts/curate.js

@@ -29,6 +29,7 @@
 //= require jquery.tokeninput
 //= require curate/select_works
 //= require curate/link_users
+//= require curate/link_groups
 //= require curate/proxy_rights
 //= require curate/facet_mine
 //= require curate/accept_contributor_agreement
@@ -54,6 +55,7 @@ Blacklight.onLoad(function() {
   });
   $('.multi_value.control-group').manage_fields();
   $('.link-users').linkUsers();
+  $('.link-groups').linkGroups();
   $('.proxy-rights').proxyRights();
 
 

data/app/assets/javascripts/curate/link_groups.js.coffee

@@ -0,0 +1,123 @@
+(($, window, document) ->
+  $this = undefined
+ 
+  # default settings
+  _settings =
+    default: 'cool!'
+    
+  _remover = $("<button class=\"btn btn-danger remove\"><i class=\"icon-white icon-minus\"></i><span>Remove</span></button>")
+  _adder   = $("<button class=\"btn btn-success add\"><i class=\"icon-white icon-plus\"></i><span>Add</span></button>")
+  
+ 
+  # This is your public API (no leading underscore, see?)
+  # All public methods must return $this so your plugin is chainable.
+  methods =
+    init: (options) ->
+      $this = $(@)
+      # The settings object is available under its name: _settings. Let's
+      # expand it with any custom options the user provided.
+      $.extend _settings, (options or {})
+      # Do anything that actually inits your plugin, if needed, right now!
+      # An important thing to keep in mind, is that jQuery plugins should be
+      # built so that one can apply them to more than one element, like so:
+      #
+      #  $('.matching-elements, #another-one').foobar()
+      #
+      
+      #This code sets up all the "Add" and "Remove" buttons for the autocomplete fields.
+      
+      #For each autocomplete set on the page, add the "Add" and "Remove" buttons
+      $this.each (index, el) ->
+        $('.autocomplete-groups').each (index, el) ->
+          _internals.autocompleteGroups(el)
+        
+        #Make sure these buttons have unique id's
+        _adder.id = "adder_" + index
+        _remover.id = "remover_" + index
+        
+        #Add the "Remove" button       
+        $('.field-wrapper:not(:last-child) .field-controls', this).append(_remover.clone())
+        
+        #Add the "Add" button
+        $('.field-controls:last', this).append(_adder.clone())
+        
+        #Bind the buttons to onClick events
+        $(el).on 'click', 'button.add', (e) ->
+          _internals.addToList(this)
+        $(el).on 'click', 'button.remove', (e) ->
+          _internals.removeFromList(this)
+        
+      return $this
+ 
+    # This method is often overlooked.
+    destroy: ->
+      # Do anything to clean it up (nullify references, unbind events…).
+      return $this
+ 
+  _internals =
+    addToList: (el) ->
+      $activeControls = $(el).closest('.field-controls')
+      $listing = $activeControls.closest('.listing')
+      $('.add', $activeControls).remove()
+      $removeControl = _remover.clone()
+      $activeControls.prepend($removeControl)
+      _internals.newRow($listing, el)
+      false
+
+    newRow: ($listing, el) ->
+      $listing.append _internals.newListItem($('li', $listing).size(), $listing, el)
+      _internals.autocompleteGroups($('.autocomplete-groups:last', $listing))
+
+
+    removeFromList: (el) ->
+      $currentGroup = $(el).closest('li')
+      $listing = $currentGroup.closest('.listing')
+      $currentGroup.hide()
+      # set the destroy flag
+      $('input:not([value])', $currentGroup).val('true')
+      false
+
+    newListItem: (index, el) ->
+      ## We have multiple places in a view where we need these autocomplete fields
+      ## (Work edit view for example), so we don't want to use the first #entry-template.
+      ## Using .closest isn't working, but this seems to for now.
+      source   =  $(el).parent().children().html()
+      template = Handlebars.compile(source)
+      template({index: index})
+
+    addExistingGroup: ($listItem, value, label) ->
+      source   = $listItem.parent().prev().html()
+      template = Handlebars.compile(source)
+      $list = $listItem.closest('ul')
+      $('input[required]', $list).removeAttr('required')
+      $listItem.replaceWith template({index: $('li', $list).index($listItem), value: value, label: label})
+      _internals.newRow($list)
+
+    autocompleteGroups: (el) ->
+      $targetElement = $(el)
+      $targetElement.autocomplete
+        source: (request, response) ->
+          $targetElement.data('url')
+          $.getJSON $targetElement.data('url'), { q: request.term + "*" }, ( data, status, xhr ) ->
+            matches = []
+            $.each data.response.docs, (idx, val) ->
+              matches.push {label: val['desc_metadata__title_tesim'][0], value: val['id']}
+            response( matches )
+        minLength: 2
+        focus: ( event, ui ) ->
+          $targetElement.val(ui.item.label)
+          event.preventDefault()
+        select: ( event, ui ) ->
+          _internals.addExistingGroup($targetElement.closest('li'), ui.item.value, ui.item.label)
+          $targetElement.val('')
+          event.preventDefault()
+
+ 
+  $.fn.linkGroups = (method) ->
+    if methods[method]
+      methods[method].apply this, Array::slice.call(arguments, 1)
+    else if typeof method is "object" or not method
+      methods.init.apply this, arguments
+    else
+      $.error "Method " + method + " does not exist on jquery.linkGroups"
+) jQuery, window, document

data/app/assets/javascripts/curate/link_users.js.coffee

@@ -23,17 +23,30 @@
       #
       #  $('.matching-elements, #another-one').foobar()
       #
+      
+      #This code sets up all the "Add" and "Remove" buttons for the autocomplete fields.
+      
+      #For each autocomplete set on the page, add the "Add" and "Remove" buttons
       $this.each (index, el) ->
         $('.autocomplete-users').each (index, el) ->
           _internals.autocompleteUsers(el)
-
-        $('.field-wrapper:not(:last-child) .field-controls', $this).append(_remover)
-        $('.field-controls:last', $this).append(_adder)
+        
+        #Make sure these buttons have unique id's
+        _adder.id = "adder_" + index
+        _remover.id = "remover_" + index
+        
+        #Add the "Remove" button       
+        $('.field-wrapper:not(:last-child) .field-controls', this).append(_remover.clone())
+        
+        #Add the "Add" button
+        $('.field-controls:last', this).append(_adder.clone())
+        
+        #Bind the buttons to onClick events
         $(el).on 'click', 'button.add', (e) ->
           _internals.addToList(this)
         $(el).on 'click', 'button.remove', (e) ->
           _internals.removeFromList(this)
-
+        
       return $this
  
     # This method is often overlooked.
@@ -48,11 +61,11 @@
       $('.add', $activeControls).remove()
       $removeControl = _remover.clone()
       $activeControls.prepend($removeControl)
-      _internals.newRow($listing)
+      _internals.newRow($listing, el)
       false
 
-    newRow: ($listing) ->
-      $listing.append _internals.newListItem($('li', $listing).size())
+    newRow: ($listing, el) ->
+      $listing.append _internals.newListItem($('li', $listing).size(), $listing, el)
       _internals.autocompleteUsers($('.autocomplete-users:last', $listing))
 
 
@@ -64,13 +77,19 @@
       $('input:not([value])', $currentUser).val('true')
       false
 
-    newListItem: (index) ->
-      source   = $("#entry-template").html()
+    newListItem: (index, el) ->
+      ## We have multiple places in a view where we need these autocomplete fields
+      ## (Work edit view for example), so we don't want to use the first #entry-template.
+      ## Using .closest isn't working, but this seems to for now.
+      source   =  $(el).parent().children().html()
       template = Handlebars.compile(source)
       template({index: index})
 
     addExistingUser: ($listItem, value, label) ->
-      source   = $("#existing-user-template").html()
+      ## We have multiple places in a view where we need these autocomplete fields
+      ## (Work edit view for example), so we don't want to use the first #existing-user-template.
+      ## Using .closest isn't working, but this seems to for now.
+      source   = $listItem.parent().prev().html()
       template = Handlebars.compile(source)
       $list = $listItem.closest('ul')
       $('input[required]', $list).removeAttr('required')

data/app/assets/stylesheets/curate.css.scss

@@ -10,6 +10,7 @@
  *
  *= require jquery-ui-lightness
  *= require curate/linkedUsers
+ *= require curate/linkedGroups
  *= require_self
  */
 

data/app/assets/stylesheets/curate/linkedGroups.css.scss

@@ -0,0 +1,16 @@
+.link-groups {
+  .input-append .linked-group {
+    display: inline-block;
+    width: 275px;
+    height: 20px;
+    padding: 4px;
+    font-size: 14pt;
+    border-radius: 4px 0 0 4px;
+    border: 1px solid #cccccc;
+  }
+
+  .listing {
+    margin: 0;
+  }
+}
+

data/app/assets/stylesheets/curate/linkedUsers.css.scss

@@ -9,6 +9,10 @@
     border: 1px solid #cccccc;
   }
 
+  .current-user {
+    border: 0px !important;
+  }
+
   .listing {
     margin: 0;
   }

data/app/assets/stylesheets/modules.scss

@@ -10,4 +10,5 @@
 @import 'modules/site_actions';
 @import 'modules/site_search';
 @import 'modules/attributes';
-@import 'modules/pagination'
+@import 'modules/pagination';
+@import 'modules/profile';

data/app/assets/stylesheets/modules/forms.css.scss

@@ -85,3 +85,8 @@ form.button-to {
 form.pull-right {
   margin-right:0;
 }
+
+.inline-checkbox {
+  display: inline-block;
+  padding-right:1em;
+}

data/app/assets/stylesheets/modules/profile.css.scss

@@ -0,0 +1,51 @@
+/*
+ * This file contains special styles for use on the detailed profile page of
+ * a user.  See app/views/curate/people for uses.
+ */
+
+#person_profile .collection-listing .collection-listing {
+  list-style-type:disc;
+  margin:0 0 1em;
+
+  .with-controls {
+    line-height:2;
+  }
+}
+
+#person_profile .collection-listing .collection-listing .collection-member {
+  padding-bottom:.5em;
+  margin-left:2em;
+}
+
+#profile_details {
+  max-width: 350px;
+}
+
+#profile_details table th {
+  width:50%;
+  vertical-align:top;
+  text-align:right;
+  padding:0.1em 0.3em 0 0;
+}
+
+#profile_details table td {
+  width:50%;
+  vertical-align:bottom;
+  padding:0.1em 0.3em 0 0;
+}
+
+#profile_details table {
+  margin-bottom:2em;
+}
+
+.framed-picture  {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 2em 2em 2.5em 2em;
+}
+
+.profile-details {
+  background-color: aliceblue;
+}
+

data/app/controllers/catalog_controller.rb

@@ -19,7 +19,7 @@ class CatalogController < ApplicationController
   CatalogController.solr_search_params_logic += [:exclude_unwanted_models]
 
   before_filter :agreed_to_terms_of_service!
-  
+
   skip_before_filter :default_html_head
 
   def index
@@ -27,6 +27,16 @@ class CatalogController < ApplicationController
     super
   end
 
+  def self.human_readable_type_hash
+    { :article_facet => { :label => 'Articles', :fq => "active_fedora_model_ssi:Article" },
+      :dataset_facet => { :label => 'Datasets', :fq => "active_fedora_model_ssi:Dataset" },
+      :document_facet=> { :label => 'Document', :fq => "active_fedora_model_ssi:Document" },
+      :etd_facet=> { :label => 'ETD', :fq => "active_fedora_model_ssi:Etd" },
+      :generic_file_facet=> { :label => 'Generic Files', :fq => "active_fedora_model_ssi:GenericFile" },
+      :generic_work_facet=> { :label => 'Generic Works', :fq => "active_fedora_model_ssi:GenericWork" },
+      :image_facet => { :label => 'Images', :fq => "active_fedora_model_ssi:Image"}}
+  end
+
   def self.uploaded_field
     #  system_create_dtsi
     solr_name('desc_metadata__date_uploaded', :stored_sortable, type: :date)
@@ -36,13 +46,25 @@ class CatalogController < ApplicationController
     solr_name('desc_metadata__date_modified', :stored_sortable , type: :date)
   end
 
+  def self.search_config
+     # Set parameters to send to SOLR
+     # First inspect contents of the hash from Yaml configuration file
+     # See config/search_config.yml
+     initialized_config = Curate.configuration.search_config['catalog']
+     # If the hash is empty, set reasonable defaults for this search type
+     if initialized_config.nil?
+        Hash['qf' => ['desc_metadata__title_tesim','desc_metadata__name_tesim'],'qt' => 'search','rows' => 10]
+     else
+        initialized_config
+     end
+  end
 
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
-      qf: [solr_name("desc_metadata__title", :stored_searchable), solr_name("desc_metadata__name", :stored_searchable)],
-      qt: "search",
-      rows: 10
+      qf: search_config['qf'],
+      qt: search_config['qt'],
+      rows: search_config['rows']
     }
 
     # solr field configuration for search results/index views
@@ -56,10 +78,9 @@ class CatalogController < ApplicationController
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
-    config.add_facet_field solr_name("human_readable_type", :facetable), label: "Type of Work", limit: 5
+    config.add_facet_field solr_name("human_readable_type", :facetable), label: "Type of Work", :query => human_readable_type_hash, limit: 5
     config.add_facet_field solr_name(:desc_metadata__creator, :facetable), label: "Creator", helper_method: :creator_name_from_pid, limit: 5
-    config.add_facet_field solr_name(:collection, :facetable), label: "Collection",  helper_method: :collection_title_from_pid, limit: 5
-    
+
     config.add_facet_field solr_name("desc_metadata__tag", :facetable), label: "Keyword", limit: 5
     config.add_facet_field solr_name("desc_metadata__subject", :facetable), label: "Subject", limit: 5
     config.add_facet_field solr_name("desc_metadata__language", :facetable), label: "Language", limit: 5
@@ -329,6 +350,14 @@ class CatalogController < ApplicationController
 
   protected
 
+    # Override Hydra::PolicyAwareAccessControlsEnforcement
+    def gated_discovery_filters
+      if current_user and current_user.manager?
+        return []
+      end
+      super
+    end
+
     # Overriding blacklight so that the search results can be displayed in a way compatible with
     # tokenInput javascript library.  This is used for suggesting "Related Works" to attach.
     def render_search_results_as_json
@@ -361,6 +390,7 @@ class CatalogController < ApplicationController
       solr_parameters[:fq] << "-has_model_ssim:\"info:fedora/afmodel:Profile\""
       solr_parameters[:fq] << "-has_model_ssim:\"info:fedora/afmodel:ProfileSection\""
       solr_parameters[:fq] << "-has_model_ssim:\"info:fedora/afmodel:LinkedResource\""
+      solr_parameters[:fq] << "-has_model_ssim:\"info:fedora/afmodel:Hydramata_Group\""
       return solr_parameters
     end
 

data/app/controllers/curate/collections_controller.rb

@@ -55,8 +55,23 @@ class Curate::CollectionsController < ApplicationController
   before_filter :load_and_authorize_collection, only: [:add_member_form, :add_member]
 
   def new
+    super
     @add_to_profile = params.delete(:add_to_profile)
+  end
+
+  def create
+    super
+    @collection.file = params[ :collection ][ :file ] if params[ :collection ][ :file ]
+  end
+
+  def update
+    super
+    @collection.file = params[ :collection ][ :file ] if params[ :collection ][ :file ]
+  end
+
+  def index
     super
+    redirect_to catalog_index_path(:'f[generic_type_sim][]' => 'Collection', works: 'mine')
   end
 
   def add_member_form