curation_concerns 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a6a05c11364b9cc72ba7f97963f9a3c32252d17
-  data.tar.gz: 61ad7ed57f29b8661b302527f9c2634eef19a52d
+  metadata.gz: 489a8d74c2cc2694cae734316ac806ccb728ba35
+  data.tar.gz: dc4312a11afa53f206991fe1777d9f5ea416e08c
 SHA512:
-  metadata.gz: f79451b81f8820ee146a1438136f9bb3c526be5ed1e2d50922278c841d77cfb4ec276e6a7442c7c24b8172fa368775b2a500ea9752f4a3ac63a63922a29a101e
-  data.tar.gz: d5cba535b0c5d4279402f0b3709b0cc333c691e49713c150ac5110077c95b5e28074c58e01f9c3f10fe2f39cd2d73fa5ecae9c27d1f9de55954746bbbdc8f682
+  metadata.gz: bbadbe42f6cb6b7153ad122fdd935ca085f7bfc9bae9fca0d5a0fc6390926063b8ac6f34693187a052c6ae56e7f9184942b6fa332a0e584e40e2eddd9de585a0
+  data.tar.gz: 8b029a62c46cdf9748048bed0b3d5f6eb1945f346ea165555253257f8dc87b9a4cb7235d00cbe0087667a53220f352ca1a473acf661152ca0676fb39f3f15568

data/.gitignore

@@ -10,4 +10,5 @@ jetty
 solr_conf/
 spec/internal
 .internal_test_app
+.byebug_history
 spec/mock_upload_directory

data/.travis.yml

@@ -6,3 +6,11 @@ rvm:
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#projecthydra"
+    template:
+      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+before_script:
+  - jdk_switcher use oraclejdk8

data/Gemfile

@@ -1,10 +1,9 @@
 source 'https://rubygems.org'
 
+gem 'hydra-works', github: 'projecthydra-labs/hydra-works'
 # Specify your gem's dependencies in curation_concerns.gemspec
 gemspec
 
-gem 'slop', '~> 3.6.0' # This just helps us generate a valid Gemfile.lock when Rails 4.2 is installed (which requires byebug which has a dependency on slop)
-
 gem 'curation_concerns-models', path: './curation_concerns-models'
 
 group :development, :test do

data/README.md

@@ -23,7 +23,7 @@ And then execute:
 
     $ bundle install
 
-Then:
+Then run the install generator.  You will be prompted if you want to overwrite the default `app/controllers/catalog_controller.rb`, to which you should type `Y` (yes). If you don't want to be prompted on overwrite, you may run the generator with the `-f` (force) option.
 
     $ rails generate curation_concerns:install
     $ rake db:migrate

data/Rakefile

@@ -10,7 +10,7 @@ Dir.glob('tasks/*.rake').each { |r| import r }
 # This makes it possible to run curation_concerns:jetty:config from here.
 import 'curation_concerns-models/lib/tasks/curation_concerns-models_tasks.rake'
 
-Jettywrapper.hydra_jetty_version = 'v8.3.1'
+Jettywrapper.hydra_jetty_version = 'v8.6.0'
 
 desc 'Run style checker'
 RuboCop::RakeTask.new(:rubocop) do |task|

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app/assets/javascripts/curation_concerns/curation_concerns.js

@@ -10,5 +10,7 @@ Blacklight.onLoad(function() {
   $('abbr').tooltip();
 
   $("[data-toggle='dropdown']").dropdown();
+  $('a[data-toggle="popover"]').popover({ html: true })
+                                 .click(function() { return false });
 
 });

data/app/assets/javascripts/curation_concerns/uploader.js

@@ -60,6 +60,7 @@ var filestoupload =0;
         $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click();
       }
       var total_sz = parseInt($('#total_upload_size').val()) + data.files[0].size;
+      $('#total_upload_size').val( total_sz );
       // is file size too big
       if (data.files[0].size > max_file_size) {
         $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click();
@@ -69,7 +70,9 @@ var filestoupload =0;
       // cumulative upload file size is too big
       else if( total_sz > max_total_file_size) {
         if (first_file_after_max == '') first_file_after_max = data.files[0].name;
-        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click();
+        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click(); 
+        // artificially bump size to max so small files don't sneak in out of order.
+        $('#total_upload_size').val( max_total_file_size );
         $("#errmsg").html("All files selected from " + first_file_after_max + " and after will not be uploaded because your total upload is too big. You may not upload more than " + max_total_file_size_str + " in one upload.");
         $("#errmsg").fadeIn('slow');
       }
@@ -79,9 +82,6 @@ var filestoupload =0;
         $("#errmsg").html("All files selected from " + first_file_after_max + " and after will not be uploaded because your total number of files is too big. You may not upload more than " + max_file_count + " files in one upload.");
         $("#errmsg").fadeIn('slow');
       }
-      else {
-        $('#total_upload_size').val( parseInt($('#total_upload_size').val()) + data.files[0].size );
-      }
     }
 
 

data/app/assets/stylesheets/curation_concerns/_modules.scss

@@ -10,4 +10,5 @@
 @import 'modules/site_search';
 @import 'modules/pagination';
 @import 'modules/embargoes';
+@import 'modules/icons';
 

data/app/assets/stylesheets/curation_concerns/_positioning.scss

@@ -142,3 +142,6 @@ legend + .form-group {
   }
 }
 
+.img-responsive, figure {
+  display: inline-block;
+}

data/app/assets/stylesheets/curation_concerns/modules/icons.scss

@@ -0,0 +1,11 @@
+.large-icon {
+  font-size: 1.5em;
+}
+
+.help-icon {
+  @extend .glyphicon;
+  @extend .glyphicon-question-sign;
+  @extend .large-icon;
+  top: 5px;
+}
+

data/app/controllers/concerns/curation_concerns/api.rb

@@ -4,22 +4,11 @@ module CurationConcerns
 
     def self.generate_response_body(response_type: :success, message: nil, options: {})
       json_body = default_responses[response_type].merge(options)
-      json_body[:description] = message if message && !messages_to_override.include?(message)
+      json_body[:description] = message if message
       json_body
     end
 
-    # Messages that should be overridden by defaults from locale file
-    # ie. exception messages from CanCan::AccessDenied
-
-    def self.messages_to_override
-      [
-        'You are not authorized to access this page.',
-        'ActiveFedora::ObjectNotFoundError'
-      ]
-    end
-
     # Default (json) responses for various response types
-
     def self.default_responses
       {
         success: {

data/app/controllers/concerns/curation_concerns/application_controller_behavior.rb

@@ -7,31 +7,45 @@ module CurationConcerns
     included do
       helper CurationConcerns::MainAppHelpers
 
-      rescue_from ActiveFedora::ObjectNotFoundError do |exception|
+      rescue_from ActiveFedora::ObjectNotFoundError do |_exception|
         respond_to do |wants|
-          wants.html { render file: "#{Rails.root}/public/404", format: :html, status: :not_found, layout: false }
-          wants.json { render_json_response(response_type: :not_found, message: exception.message) }
+          wants.json { render_json_response(response_type: :not_found) }
+          # default to HTML response, even for other non-HTML formats we don't
+          # neccesarily know about, seems to be consistent with what Rails4 does
+          # by default with uncaught ActiveRecord::RecordNotFound in production
+          wants.any do
+            # use standard, possibly locally overridden, 404.html file. Even for
+            # possibly non-html formats, this is consistent with what Rails does
+            # on raising an ActiveRecord::RecordNotFound. Rails.root IS needed
+            # for it to work under testing, without worrying about CWD.
+            render file: "#{Rails.root}/public/404.html", status: :not_found, layout: false
+          end
         end
       end
     end
 
+    # Called by Hydra::Controller::ControllerBehavior when CanCan::AccessDenied is caught
+    # @param [CanCan::AccessDenied] exception error to handle
     def deny_access(exception)
+      # For the JSON message, we don't want to display the default CanCan messages,
+      # just custom Hydra messages such as "This item is under embargo.", etc.
+      json_message = exception.message if exception.is_a? Hydra::AccessDenied
       if current_user && current_user.persisted?
         respond_to do |wants|
           wants.html do
-            if [:show, :edit, :update, :destroy].include? exception.action
+            if [:show, :edit, :create, :update, :destroy].include? exception.action
               render 'curation_concerns/base/unauthorized', status: :unauthorized
             else
               redirect_to main_app.root_url, alert: exception.message
             end
           end
-          wants.json { render_json_response(response_type: :forbidden, message: exception.message) }
+          wants.json { render_json_response(response_type: :forbidden, message: json_message) }
         end
       else
         session['user_return_to'.freeze] = request.url
         respond_to do |wants|
           wants.html { redirect_to main_app.new_user_session_path, alert: exception.message }
-          wants.json { render_json_response(response_type: :unauthorized, message: exception.message) }
+          wants.json { render_json_response(response_type: :unauthorized, message: json_message) }
         end
       end
     end

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -26,6 +26,7 @@ module CurationConcerns::CurationConcernController
   end
 
   def new
+    build_form
   end
 
   def create
@@ -46,12 +47,7 @@ module CurationConcerns::CurationConcernController
   #   or the user doesn't have access to it.
   def show
     respond_to do |wants|
-      wants.html do
-        _, document_list = search_results(params, CatalogController.search_params_logic + [:find_one])
-        curation_concern = document_list.first
-        raise CanCan::AccessDenied.new(nil, :show) unless curation_concern
-        @presenter = show_presenter.new(curation_concern, current_ability)
-      end
+      wants.html { presenter }
       wants.json do
         # load and authorize @curation_concern manually because it's skipped for html
         # This has to use #find instead of #load_instance_from_solr because
@@ -60,23 +56,12 @@ module CurationConcerns::CurationConcernController
         authorize! :show, @curation_concern
         render :show, status: :ok
       end
+      additional_response_formats(wants)
     end
   end
 
-  # Gives the class of the show presenter. Override this if you want
-  # to use a different presenter.
-  def show_presenter
-    CurationConcerns::WorkShowPresenter
-  end
-
-  # Gives the class of the form. Override this if you want
-  # to use a different form.
-  def form_class
-    CurationConcerns.const_get("#{self.class.curation_concern_type}Form")
-  end
-
   def edit
-    @form = form_class.new(curation_concern, current_ability)
+    build_form
   end
 
   def update
@@ -86,7 +71,7 @@ module CurationConcerns::CurationConcernController
       setup_form
       respond_to do |wants|
         wants.html do
-          @form = form_class.new(curation_concern, current_ability)
+          build_form
           render 'edit', status: :unprocessable_entity
         end
         wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: curation_concern.errors }) }
@@ -104,10 +89,30 @@ module CurationConcerns::CurationConcernController
 
   protected
 
+    # Gives the class of the show presenter. Override this if you want
+    # to use a different presenter.
+    def show_presenter
+      CurationConcerns::WorkShowPresenter
+    end
+
+    # Gives the class of the form. Override this if you want
+    # to use a different form.
+    def form_class
+      CurationConcerns.const_get("#{self.class.curation_concern_type.to_s.demodulize}Form")
+    end
+
+    def build_form
+      @form = form_class.new(curation_concern, current_ability)
+    end
+
     def actor
       @actor ||= CurationConcerns::CurationConcern.actor(curation_concern, current_user, attributes_for_actor)
     end
 
+    def presenter
+      @presenter ||= show_presenter.new(curation_concern_from_search_results, current_ability)
+    end
+
     # Override setup_form in concrete controllers to get the form ready for display
     def setup_form
       return unless curation_concern.respond_to?(:contributor) && curation_concern.contributor.blank?
@@ -120,8 +125,8 @@ module CurationConcerns::CurationConcernController
 
     def after_create_response
       respond_to do |wants|
-        wants.html { redirect_to [main_app, :curation_concerns, curation_concern] }
-        wants.json { render :show, status: :created, location: polymorphic_path([main_app, :curation_concerns, curation_concern]) }
+        wants.html { redirect_to [main_app, curation_concern] }
+        wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
       end
     end
 
@@ -131,8 +136,8 @@ module CurationConcerns::CurationConcernController
         redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
       else
         respond_to do |wants|
-          wants.html { redirect_to [main_app, :curation_concerns, curation_concern] }
-          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, :curation_concerns, curation_concern]) }
+          wants.html { redirect_to [main_app, curation_concern] }
+          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
         end
       end
     end
@@ -150,6 +155,20 @@ module CurationConcerns::CurationConcernController
     end
 
     def hash_key_for_curation_concern
-      self.class.curation_concern_type.name.underscore.to_sym
+      self.class.curation_concern_type.model_name.param_key
+    end
+
+    # Override this method to add additional response
+    # formats to your local app
+    def additional_response_formats(_)
+      # nop
+    end
+
+  private
+
+    def curation_concern_from_search_results
+      _, document_list = search_results(params, CatalogController.search_params_logic + [:find_one])
+      raise CanCan::AccessDenied.new(nil, :show) if document_list.empty?
+      document_list.first
     end
 end

data/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb

@@ -23,7 +23,7 @@ module CurationConcerns
 
     # routed to /files/:id/edit
     def edit
-      @groups = current_user.groups
+      initialize_edit_form
     end
 
     # routed to /files (POST)
@@ -45,7 +45,7 @@ module CurationConcerns
       end
     rescue RSolr::Error::Http => error
       logger.error "FileSetController::create rescued #{error.class}\n\t#{error}\n #{error.backtrace.join("\n")}\n\n"
-      render_json_response(response_type: :internal_error, options: { message: 'Error occurred while creating generic file.' })
+      render_json_response(response_type: :internal_error, options: { message: 'Error occurred while creating a FileSet.' })
     ensure
       # remove the tempfile (only if it is a temp file)
       file.tempfile.delete if file.respond_to?(:tempfile)
@@ -54,19 +54,13 @@ module CurationConcerns
     # routed to /files/:id
     def show
       respond_to do |wants|
-        wants.html do
-          _, document_list = search_results(params, [:add_access_controls_to_solr_params, :find_one, :only_file_sets])
-          curation_concern = document_list.first
-          raise CanCan::AccessDenied unless curation_concern
-          @presenter = show_presenter.new(curation_concern, current_ability)
-        end
+        wants.html { presenter }
         wants.json do
           # load and authorize @curation_concern manually because it's skipped for html
           @file_set = curation_concern_type.load_instance_from_solr(params[:id]) unless curation_concern
           authorize! :show, @file_set
           render :show, status: :ok
         end
-        additional_response_formats(wants)
       end
     end
 
@@ -76,9 +70,16 @@ module CurationConcerns
       CurationConcerns::FileSetPresenter
     end
 
+    # Gives the class of the form. Override this if you want
+    # to use a different form.
+    def form_class
+      CurationConcerns::Forms::FileSetEditForm
+    end
+
     def destroy
+      parent = @file_set.in_works.first
       actor.destroy
-      redirect_to [main_app, :curation_concerns, @file_set.in_works.first], notice: 'The file has been deleted.'
+      redirect_to [main_app, parent], notice: 'The file has been deleted.'
     end
 
     # routed to /files/:id (PUT)
@@ -95,14 +96,16 @@ module CurationConcerns
       if success
         respond_to do |wants|
           wants.html do
-            redirect_to [main_app, :curation_concerns, @file_set], notice:
-                                                                         "The file #{view_context.link_to(@file_set, [main_app, :curation_concerns, @file_set])} has been updated."
+            redirect_to [main_app, @file_set], notice: "The file #{view_context.link_to(@file_set, [main_app, @file_set])} has been updated."
           end
-          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, :curation_concerns, @file_set]) }
+          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, @file_set]) }
         end
       else
         respond_to do |wants|
-          wants.html { render 'edit', status: :unprocessable_entity }
+          wants.html do
+            initialize_edit_form
+            render 'edit', status: :unprocessable_entity
+          end
           wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: @file_set.errors }) }
         end
       end
@@ -118,16 +121,23 @@ module CurationConcerns
 
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
-      file_attributes = CurationConcerns::Forms::FileSetEditForm.model_attributes(attributes)
+      file_attributes = form_class.model_attributes(attributes)
       actor.update_metadata(file_attributes)
     end
 
     protected
 
-      # Override this method to add additional response
-      # formats to your local app
-      def additional_response_formats(_)
-        # nop
+      def presenter
+        @presenter ||= begin
+          _, document_list = search_results(params, [:add_access_controls_to_solr_params, :find_one, :only_file_sets])
+          curation_concern = document_list.first
+          raise CanCan::AccessDenied unless curation_concern
+          show_presenter.new(curation_concern, current_ability)
+        end
+      end
+
+      def initialize_edit_form
+        @groups = current_user.groups
       end
 
       def file_set_params
@@ -169,19 +179,18 @@ module CurationConcerns
 
       def process_file(file)
         update_metadata_from_upload_screen
-        parent = ActiveFedora::Base.find(parent_id)
-        actor.create_metadata(params[:upload_set_id], parent, params[:file_set])
+        actor.create_metadata(find_parent_by_id, params[:file_set])
         if actor.create_content(file)
           respond_to do |format|
             format.html do
               if request.xhr?
                 render 'jq_upload', formats: 'json', content_type: 'text/html'
               else
-                redirect_to [main_app, :curation_concerns, @file_set.in_works.first]
+                redirect_to [main_app, @file_set.in_works.first]
               end
             end
             format.json do
-              render 'jq_upload', status: :created, location: polymorphic_path([main_app, :curation_concerns, curation_concern])
+              render 'jq_upload', status: :created, location: polymorphic_path([main_app, curation_concern])
             end
           end
         else

data/app/controllers/concerns/curation_concerns/parent_container.rb

@@ -3,7 +3,6 @@ module CurationConcerns::ParentContainer
 
   included do
     helper_method :parent
-    # before_filter :authorize_edit_parent_rights!, except: [:show]  # Not sure we actually want this enforced any more (was originally in worthwhile), especially since GenericFiles and GenericWorks (which are PCDM::Objects)can belong to multiple parents
   end
 
   # TODO: this is slow, refactor to return a Presenter (fetch from solr)
@@ -36,14 +35,4 @@ module CurationConcerns::ParentContainer
     def new_or_create?
       %w(create new).include? action_name
     end
-
-    def namespaced_parent_id
-      # Sufia::Noid.namespaceize(params[:parent_id])
-    end
-
-    # restricts edit access so that you can only edit a record if you can also edit its parent.
-
-    def authorize_edit_parent_rights!
-      authorize! :edit, parent_id
-    end
 end

data/app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb

@@ -26,7 +26,7 @@ module CurationConcerns
     end
 
     def new_show
-      @su = SingleUseLink.create itemId: params[:id], path: polymorphic_path([main_app, :curation_concerns, asset])
+      @su = SingleUseLink.create itemId: params[:id], path: polymorphic_path([main_app, asset])
       @link = curation_concerns.show_single_use_link_path(@su.downloadKey)
 
       respond_to do |format|

data/app/controllers/concerns/curation_concerns/single_use_links_viewer_controller_behavior.rb

@@ -29,7 +29,7 @@ module CurationConcerns
       # Authorize using SingleUseLinksViewerController::Ability
       authorize! :read, curation_concern
 
-      raise not_found_exception unless single_use_link.path == polymorphic_path([main_app, :curation_concerns, curation_concern])
+      raise not_found_exception unless single_use_link.path == polymorphic_path([main_app, curation_concern])
 
       # show the file
       @presenter = presenter_class.new(curation_concern, current_ability)
@@ -41,6 +41,12 @@ module CurationConcerns
 
     protected
 
+      def content_options
+        super.tap do |options|
+          options[:disposition] = 'attachment' if action_name == 'download'
+        end
+      end
+
       # This is called in a before filter. It causes @asset to be set.
       def authorize_download!
         authorize! :read, asset

data/app/controllers/concerns/curation_concerns/upload_sets_controller_behavior.rb

@@ -8,31 +8,43 @@ module CurationConcerns
       with_themed_layout '1_column'
 
       class_attribute :edit_form_class
-      self.edit_form_class = CurationConcerns::Forms::FileSetEditForm
+      self.edit_form_class = CurationConcerns::UploadSetForm
     end
 
     def edit
+      # TODO: redlock this line so that two processes don't attempt to create at the same time.
       @upload_set = UploadSet.find_or_create(params[:id])
       @form = edit_form
     end
 
     def update
       authenticate_user!
-      @upload_set = UploadSet.find_or_create(params[:id])
+      @upload_set = UploadSet.find(params[:id])
       @upload_set.status = ["processing"]
       @upload_set.save
-      file_attributes = edit_form_class.model_attributes(params[:file_set])
-      UploadSetUpdateJob.perform_later(current_user.user_key, params[:id], params[:title], file_attributes, params[:visibility])
+      create_update_job
       flash[:notice] = 'Your files are being processed by ' + t('curation_concerns.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-danger" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
 
-      redirect_to main_app.curation_concerns_generic_works_path
+      redirect_after_update
     end
 
     protected
 
+      # Override this method if you want to go elsewhere
+      def redirect_after_update
+        redirect_to main_app.curation_concerns_generic_works_path
+      end
+
       def edit_form
-        file_set = ::FileSet.new(creator: [current_user.user_key], title: @upload_set.file_sets.map(&:label))
-        edit_form_class.new(file_set)
+        edit_form_class.new(@upload_set, current_ability)
+      end
+
+      def create_update_job
+        UploadSetUpdateJob.perform_later(current_user.user_key,
+                                         params[:id],
+                                         params[:title],
+                                         edit_form_class.model_attributes(params[:upload_set]),
+                                         params[:visibility])
       end
   end
 end

data/app/controllers/curation_concerns/permissions_controller.rb

@@ -9,7 +9,7 @@ class CurationConcerns::PermissionsController < ApplicationController
   def copy
     VisibilityCopyJob.perform_later(curation_concern.id)
     flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
-    redirect_to polymorphic_path([main_app, :curation_concerns, curation_concern]), notice: flash_message
+    redirect_to [main_app, curation_concern], notice: flash_message
   end
 
   def curation_concern

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -3,8 +3,12 @@ module CurationConcerns
     class CollectionEditForm
       include HydraEditor::Form
       self.model_class = ::Collection
-      self.terms = [:resource_type, :title, :creator, :contributor, :description, :tag, :rights,
-                    :publisher, :date_created, :subject, :language, :identifier, :based_near,
+
+      delegate :human_readable_type, :member_ids, to: :model
+
+      self.terms = [:resource_type, :title, :creator, :contributor, :description,
+                    :tag, :rights, :publisher, :date_created, :subject, :language,
+                    :representative_id, :thumbnail_id, :identifier, :based_near,
                     :related_url, :visibility]
 
       # Test to see if the given field is required

data/app/forms/curation_concerns/forms/work_form.rb

@@ -4,9 +4,14 @@ module CurationConcerns
       include HydraEditor::Form
       attr_accessor :current_ability
 
+      delegate :human_readable_type, :open_access?, :authenticated_only_access?,
+               :open_access_with_embargo_release_date?, :private_access?,
+               :embargo_release_date, :lease_expiration_date, :member_ids, to: :model
+
       self.terms = [:title, :creator, :contributor, :description,
-                    :subject, :publisher, :source, :language,
-                    :representative_id, :thumbnail_id, :rights, :files,
+                    :tag, :rights, :publisher, :date_created, :subject, :language,
+                    :identifier, :based_near, :related_url,
+                    :representative_id, :thumbnail_id, :files,
                     :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo,
                     :visibility_during_lease, :lease_expiration_date, :visibility_after_lease,
                     :visibility]
@@ -14,8 +19,14 @@ module CurationConcerns
       # @param [ActiveFedora::Base,#member_ids] model
       # @param [Ability] current_ability
       def initialize(model, current_ability)
-        @model = model
         @current_ability = current_ability
+        super(model)
+      end
+
+      # The value for embargo_relase_date and lease_expiration_date should not
+      # be initialized to empty string
+      def initialize_field(key)
+        super unless [:embargo_release_date, :lease_expiration_date].include?(key)
       end
 
       # The possible values for the representative_id dropdown