hydra-head 3.3.0 → 4.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +2 -0
- data/Gemfile.lock +155 -181
- data/HISTORY.textile +5 -0
- data/INSTALL_PREREQ.textile +6 -3
- data/README.textile +8 -4
- data/{assets → app/assets}/images/hydra/powered_by_hydra.png +0 -0
- data/{assets → app/assets}/images/hydra/search-button.png +0 -0
- data/{assets → app/assets}/javascripts/date-picker/booking/index.html +0 -0
- data/{assets → app/assets}/javascripts/date-picker/calendarHTML.txt +0 -0
- data/{assets → app/assets}/javascripts/date-picker/css/datepicker.css +0 -0
- data/{assets → app/assets}/javascripts/date-picker/css/demo.css +0 -0
- data/{assets → app/assets}/javascripts/date-picker/index.html +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/datepicker.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/datepicker.packed.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/ar.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/cs.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/da.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/de.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/en.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/eo.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/es.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/et.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/fi.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/fr.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/he.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/hu.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/id.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/it.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/kr.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/lt.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/lv.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/nl.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/no.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/pl.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/pt-br.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/pt.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/ru.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/se.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/si.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/js/lang/tr.js +0 -0
- data/{assets → app/assets}/javascripts/date-picker/language/index.html +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/Thumbs.db +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/backstripes.gif +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/bg_header.jpg +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/bullet1.gif +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/bullet2.gif +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/cal-grey.gif +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/cal.gif +0 -0
- data/{assets → app/assets}/javascripts/date-picker/media/gradient-e5e5e5-ffffff.gif +0 -0
- data/{assets → app/assets}/javascripts/hydra/hydra-head.js +0 -0
- data/{assets → app/assets}/javascripts/hydra/mediashelf.datepicker.js +0 -0
- data/{assets → app/assets}/javascripts/hydra/mediashelf.placeholder.js +0 -0
- data/{assets → app/assets}/javascripts/jquery.form.js +0 -0
- data/{assets → app/assets}/javascripts/jquery.ui.datepicker.js +0 -0
- data/{assets → app/assets}/javascripts/spin.min.js +0 -0
- data/{assets → app/assets}/stylesheets/hydra/html_refactor.css +2 -2
- data/{assets → app/assets}/stylesheets/hydra/hydrangea-split-button.css +0 -0
- data/{assets → app/assets}/stylesheets/hydra/hydrangea.css +0 -0
- data/{assets → app/assets}/stylesheets/hydra/ie-styles.css +0 -0
- data/{assets → app/assets}/stylesheets/hydra/styles.css +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_flat_55_fbec88_40x100.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_85_dfeffc_1x400.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_glass_95_fef1ec_1x400.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_217bc0_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_2e83ff_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_469bdd_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_6da8d5_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_cd0a0a_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_d8e7f3_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/images/ui-icons_f9bd01_256x240.png +0 -0
- data/{assets → app/assets}/stylesheets/redmond/jquery-ui-1.8.5.custom.css +0 -0
- data/app/controllers/downloads_controller.rb +0 -16
- data/app/controllers/hydra/assets_controller.rb +3 -0
- data/app/controllers/{contributors_controller.rb → hydra/contributors_controller.rb} +11 -16
- data/app/controllers/hydra/file_assets_controller.rb +3 -0
- data/app/controllers/hydra/permissions_controller.rb +104 -0
- data/app/helpers/hydra/blacklight_helper_behavior.rb +13 -51
- data/app/helpers/hydra/downloads_helper_behavior.rb +1 -1
- data/app/helpers/hydra/hydra_assets_helper_behavior.rb +5 -6
- data/app/helpers/hydra/hydra_fedora_metadata_helper_behavior.rb +0 -1
- data/app/helpers/hydra/hydra_helper_behavior.rb +1 -1
- data/app/helpers/hydra/hydra_uploader_helper_behavior.rb +1 -1
- data/app/models/mods_asset.rb +4 -0
- data/app/models/role_mapper.rb +2 -2
- data/app/views/catalog/_document_list.html.erb +2 -2
- data/app/views/catalog/_edit_partials/_default.html.erb +1 -1
- data/app/views/catalog/_edit_partials/_default_details.html.erb +1 -1
- data/app/views/catalog/_index_partials/_default.html.erb +1 -1
- data/app/views/catalog/_show_partials/_default.html.erb +1 -1
- data/app/views/contributors/_add_contributor_split_button.html.erb +4 -4
- data/app/views/contributors/_edit_conference.html.erb +1 -1
- data/app/views/contributors/_edit_organization.html.erb +1 -1
- data/app/views/contributors/_edit_person.html.erb +1 -1
- data/app/views/contributors/_index.html.erb +2 -2
- data/app/views/contributors/_show_organization.html.erb +2 -2
- data/app/views/contributors/new.html.erb +4 -4
- data/app/views/generic_content_objects/_description_form.html.erb +2 -2
- data/app/views/generic_contents/_index.html.erb +1 -1
- data/app/views/generic_images/_edit.html.erb +2 -2
- data/app/views/generic_images/_index.html.erb +1 -1
- data/app/views/{file_assets → hydra/file_assets}/_asset_saved_flash.html.erb +0 -0
- data/app/views/{file_assets → hydra/file_assets}/_deletable_result.html.erb +0 -0
- data/app/views/{file_assets → hydra/file_assets}/_file_assets_form.html.erb +3 -3
- data/app/views/{file_assets → hydra/file_assets}/_index.html.erb +3 -3
- data/app/views/{file_assets → hydra/file_assets}/_new.html.erb +0 -0
- data/app/views/{file_assets → hydra/file_assets}/_result.html.erb +1 -1
- data/app/views/{file_assets → hydra/file_assets}/index.html.erb +1 -1
- data/app/views/{permissions → hydra/permissions}/_edit_person_permissions.html.erb +0 -0
- data/app/views/{permissions → hydra/permissions}/_index.html.erb +1 -1
- data/app/views/{permissions → hydra/permissions}/_new.html.erb +0 -0
- data/app/views/{permissions → hydra/permissions}/_permissions_form.html.erb +5 -6
- data/app/views/{permissions → hydra/permissions}/index.html.erb +0 -0
- data/app/views/{permissions → hydra/permissions}/new.html.erb +0 -0
- data/app/views/layouts/application.html.erb +1 -1
- data/app/views/layouts/hydra-head.html.erb +1 -1
- data/app/views/mods_assets/_additional_info_form.html.erb +2 -2
- data/app/views/mods_assets/_contributor_form.html.erb +1 -1
- data/app/views/mods_assets/_edit_description.html.erb +1 -1
- data/app/views/mods_assets/_progress_box.html.erb +2 -2
- data/app/views/mods_assets/_publication_form.html.erb +1 -1
- data/app/views/mods_assets/_show.html.erb +2 -2
- data/app/views/mods_assets/_show_description.html.erb +1 -0
- data/app/views/mods_assets/_show_file_assets.html.erb +3 -3
- data/app/views/shared/_delete_asset_confirmation.html.erb +1 -1
- data/config/fedora.yml +9 -3
- data/hydra-head.gemspec +12 -42
- data/lib/application_controller.rb +6 -7
- data/lib/generators/hydra/head_generator.rb +18 -18
- data/lib/generators/hydra/templates/catalog_controller.rb +162 -0
- data/lib/generators/hydra/templates/config/fedora.yml +9 -3
- data/lib/generators/hydra/templates/config/initializers/hydra_config.rb +4 -4
- data/lib/hydra-head.rb +0 -1
- data/lib/hydra-head/controller.rb +10 -11
- data/lib/hydra-head/routes.rb +20 -22
- data/lib/hydra-head/version.rb +1 -1
- data/lib/hydra.rb +2 -4
- data/lib/hydra/assets.rb +16 -26
- data/lib/hydra/controller.rb +5 -14
- data/lib/hydra/file_assets.rb +36 -33
- data/lib/hydra/generic_content.rb +3 -3
- data/lib/hydra/image.rb +2 -2
- data/lib/hydra/repository_controller.rb +22 -6
- data/lib/hydra/rights_metadata.rb +1 -1
- data/lib/hydra/submission_workflow.rb +4 -3
- data/lib/railties/hydra-fixtures.rake +2 -97
- data/tasks/hydra-head-fixtures.rake +0 -34
- data/tasks/hydra-head.rake +4 -3
- data/test_support/etc/Gemfile +15 -10
- data/test_support/etc/rvmrc +1 -1
- data/test_support/features/mods_asset_edit.feature +1 -1
- data/test_support/features/step_definitions/create_asset_steps.rb +0 -4
- data/test_support/features/support/env.rb +1 -1
- data/test_support/features/support/paths.rb +13 -13
- data/test_support/spec/controllers/contributors_controller_spec.rb +2 -2
- data/test_support/spec/controllers/file_assets_controller_spec.rb +22 -24
- data/test_support/spec/controllers/{assets_controller_spec.rb → hydra-assets_controller_spec.rb} +26 -11
- data/test_support/spec/controllers/hydra_controller_spec.rb +2 -3
- data/test_support/spec/controllers/permissions_controller_spec.rb +9 -53
- data/test_support/spec/controllers/user_sessions_controller_spec.rb +3 -3
- data/test_support/spec/factories.rb +11 -0
- data/test_support/spec/helpers/blacklight_helper_spec.rb +6 -13
- data/test_support/spec/helpers/hydra-repository_controller_spec.rb +37 -1
- data/test_support/spec/helpers/hydra_assets_helper_spec.rb +58 -70
- data/test_support/spec/helpers/hydra_helper_spec.rb +2 -2
- data/test_support/spec/helpers/hydra_model_methods_spec.rb +4 -4
- data/test_support/spec/helpers/hydra_uploader_helper_spec.rb +3 -3
- data/test_support/spec/integration/file_asset_spec.rb +5 -4
- data/test_support/spec/models/hydra_rights_metadata_spec.rb +7 -1
- data/test_support/spec/spec_helper.rb +5 -4
- data/vendor/cache/RedCloth-4.2.9.gem +0 -0
- data/vendor/cache/actionmailer-3.2.2.gem +0 -0
- data/vendor/cache/actionpack-3.2.2.gem +0 -0
- data/vendor/cache/{active-fedora-3.3.0.gem → active-fedora-4.0.0.rc13.gem} +0 -0
- data/vendor/cache/activemodel-3.2.2.gem +0 -0
- data/vendor/cache/activerecord-3.2.2.gem +0 -0
- data/vendor/cache/activeresource-3.2.2.gem +0 -0
- data/vendor/cache/activesupport-3.2.2.gem +0 -0
- data/vendor/cache/{addressable-2.2.6.gem → addressable-2.2.7.gem} +0 -0
- data/vendor/cache/arel-3.0.2.gem +0 -0
- data/vendor/cache/builder-3.0.0.gem +0 -0
- data/vendor/cache/childprocess-0.3.1.gem +0 -0
- data/vendor/cache/chunky_png-1.2.5.gem +0 -0
- data/vendor/cache/compass-0.12.rc.1.gem +0 -0
- data/vendor/cache/cucumber-1.1.9.gem +0 -0
- data/vendor/cache/{cucumber-rails-1.2.1.gem → cucumber-rails-1.3.0.gem} +0 -0
- data/vendor/cache/daemons-1.1.8.gem +0 -0
- data/vendor/cache/devise-2.0.4.gem +0 -0
- data/vendor/cache/erubis-2.7.0.gem +0 -0
- data/vendor/cache/factory_girl-2.6.1.gem +0 -0
- data/vendor/cache/fssm-0.2.8.1.gem +0 -0
- data/vendor/cache/gherkin-2.9.0.gem +0 -0
- data/vendor/cache/hike-1.2.1.gem +0 -0
- data/vendor/cache/httpi-0.9.6.gem +0 -0
- data/vendor/cache/i18n-0.6.0.gem +0 -0
- data/vendor/cache/journey-1.0.3.gem +0 -0
- data/vendor/cache/mail-2.4.3.gem +0 -0
- data/vendor/cache/marc-0.4.4.gem +0 -0
- data/vendor/cache/mediashelf-loggable-0.4.9.gem +0 -0
- data/vendor/cache/mocha-0.10.5.gem +0 -0
- data/vendor/cache/multi_json-1.1.0.gem +0 -0
- data/vendor/cache/nori-1.1.0.gem +0 -0
- data/vendor/cache/om-1.5.3.gem +0 -0
- data/vendor/cache/rack-1.4.1.gem +0 -0
- data/vendor/cache/rack-cache-1.1.gem +0 -0
- data/vendor/cache/rack-ssl-1.3.2.gem +0 -0
- data/vendor/cache/rack-test-0.6.1.gem +0 -0
- data/vendor/cache/{rails-3.0.11.gem → rails-3.2.2.gem} +0 -0
- data/vendor/cache/railties-3.2.2.gem +0 -0
- data/vendor/cache/rdf-0.3.5.1.gem +0 -0
- data/vendor/cache/rsolr-1.0.6.gem +0 -0
- data/vendor/cache/rspec-2.6.0.gem +0 -0
- data/vendor/cache/rspec-core-2.6.4.gem +0 -0
- data/vendor/cache/rspec-expectations-2.6.0.gem +0 -0
- data/vendor/cache/rspec-mocks-2.6.0.gem +0 -0
- data/vendor/cache/rspec-rails-2.6.1.gem +0 -0
- data/vendor/cache/rubydora-0.5.7.gem +0 -0
- data/vendor/cache/rubyzip-0.9.6.1.gem +0 -0
- data/vendor/cache/sass-3.1.15.gem +0 -0
- data/vendor/cache/sass-rails-3.2.4.gem +0 -0
- data/vendor/cache/savon-0.9.9.gem +0 -0
- data/vendor/cache/selenium-webdriver-2.20.0.gem +0 -0
- data/vendor/cache/solrizer-fedora-1.2.5.gem +0 -0
- data/vendor/cache/sprockets-2.1.2.gem +0 -0
- data/vendor/cache/sqlite3-1.3.5.gem +0 -0
- data/vendor/cache/sqlite3-ruby-1.3.3.gem +0 -0
- data/vendor/cache/stomp-1.2.1.gem +0 -0
- data/vendor/cache/tilt-1.3.3.gem +0 -0
- data/vendor/cache/tzinfo-0.3.32.gem +0 -0
- data/vendor/cache/unicode-0.4.2.gem +0 -0
- data/vendor/cache/warden-1.1.1.gem +0 -0
- data/vendor/cache/wasabi-2.1.0.gem +0 -0
- data/vendor/cache/yard-0.7.5.gem +0 -0
- metadata +298 -843
- data/app/controllers/assets_controller.rb +0 -3
- data/app/controllers/file_assets_controller.rb +0 -3
- data/app/controllers/permissions_controller.rb +0 -152
- data/app/views/generic_contents/_edit.html.erb_ +0 -39
- data/app/views/mods_assets/_edit.html.erb_ +0 -63
- data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb +0 -253
- data/lib/hydra-head/railtie.rb +0 -11
- data/lib/mediashelf/active_fedora_helper.rb +0 -68
- data/test_support/spec/lib/active_fedora_helper_spec.rb +0 -56
- data/vendor/cache/RedCloth-4.2.3.gem +0 -0
- data/vendor/cache/abstract-1.0.0.gem +0 -0
- data/vendor/cache/actionmailer-3.0.11.gem +0 -0
- data/vendor/cache/actionpack-3.0.11.gem +0 -0
- data/vendor/cache/activemodel-3.0.11.gem +0 -0
- data/vendor/cache/activerecord-3.0.11.gem +0 -0
- data/vendor/cache/activeresource-3.0.11.gem +0 -0
- data/vendor/cache/activesupport-3.0.11.gem +0 -0
- data/vendor/cache/arel-2.0.10.gem +0 -0
- data/vendor/cache/blacklight-3.1.2.gem +0 -0
- data/vendor/cache/builder-2.1.2.gem +0 -0
- data/vendor/cache/childprocess-0.3.0.gem +0 -0
- data/vendor/cache/columnize-0.3.6.gem +0 -0
- data/vendor/cache/crack-0.3.1.gem +0 -0
- data/vendor/cache/cucumber-1.1.4.gem +0 -0
- data/vendor/cache/curb-0.7.15.gem +0 -0
- data/vendor/cache/daemons-1.1.6.gem +0 -0
- data/vendor/cache/database_cleaner-0.7.1.gem +0 -0
- data/vendor/cache/devise-1.5.3.gem +0 -0
- data/vendor/cache/erubis-2.6.6.gem +0 -0
- data/vendor/cache/facets-2.8.4.gem +0 -0
- data/vendor/cache/factory_girl-2.5.0.gem +0 -0
- data/vendor/cache/gherkin-2.7.6.gem +0 -0
- data/vendor/cache/haml-3.1.4.gem +0 -0
- data/vendor/cache/httparty-0.8.1.gem +0 -0
- data/vendor/cache/httpi-0.9.5.gem +0 -0
- data/vendor/cache/i18n-0.5.0.gem +0 -0
- data/vendor/cache/json_pure-1.6.5.gem +0 -0
- data/vendor/cache/launchy-2.0.5.gem +0 -0
- data/vendor/cache/linecache-0.46.gem +0 -0
- data/vendor/cache/mail-2.2.19.gem +0 -0
- data/vendor/cache/marc-0.4.3.gem +0 -0
- data/vendor/cache/mediashelf-loggable-0.4.7.gem +0 -0
- data/vendor/cache/mocha-0.10.3.gem +0 -0
- data/vendor/cache/multi_json-1.0.4.gem +0 -0
- data/vendor/cache/multi_xml-0.4.1.gem +0 -0
- data/vendor/cache/nori-1.0.2.gem +0 -0
- data/vendor/cache/om-1.5.1.gem +0 -0
- data/vendor/cache/rack-1.2.5.gem +0 -0
- data/vendor/cache/rack-mount-0.6.14.gem +0 -0
- data/vendor/cache/rack-test-0.5.7.gem +0 -0
- data/vendor/cache/railties-3.0.11.gem +0 -0
- data/vendor/cache/rbx-require-relative-0.0.5.gem +0 -0
- data/vendor/cache/rdf-0.3.4.1.gem +0 -0
- data/vendor/cache/rsolr-1.0.2.gem +0 -0
- data/vendor/cache/rspec-2.8.0.gem +0 -0
- data/vendor/cache/rspec-core-2.8.0.gem +0 -0
- data/vendor/cache/rspec-expectations-2.8.0.gem +0 -0
- data/vendor/cache/rspec-mocks-2.8.0.gem +0 -0
- data/vendor/cache/rspec-rails-2.8.1.gem +0 -0
- data/vendor/cache/ruby-debug-0.10.4.gem +0 -0
- data/vendor/cache/ruby-debug-base-0.10.4.gem +0 -0
- data/vendor/cache/rubydora-0.5.1.gem +0 -0
- data/vendor/cache/rubyzip-0.9.5.gem +0 -0
- data/vendor/cache/savon-0.9.7.gem +0 -0
- data/vendor/cache/selenium-webdriver-2.18.0.gem +0 -0
- data/vendor/cache/solrizer-fedora-1.2.3.gem +0 -0
- data/vendor/cache/sqlite3-ruby-1.2.5.gem +0 -0
- data/vendor/cache/stomp-1.2.0.gem +0 -0
- data/vendor/cache/trollop-1.16.2.gem +0 -0
- data/vendor/cache/tzinfo-0.3.31.gem +0 -0
- data/vendor/cache/unicode-0.4.0.gem +0 -0
- data/vendor/cache/warden-1.1.0.gem +0 -0
- data/vendor/cache/wasabi-2.0.0.gem +0 -0
- data/vendor/cache/will_paginate-3.0.2.gem +0 -0
- data/vendor/cache/yard-0.7.4.gem +0 -0
@@ -31,48 +31,23 @@ module Hydra
|
|
31
31
|
def linked_label(field, field_string)
|
32
32
|
link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
|
33
33
|
end
|
34
|
-
def link_to_document(doc, opts={:label=>Blacklight.config[:index][:show_link].to_sym, :counter => nil,:title => nil})
|
35
|
-
label = case opts[:label]
|
36
|
-
when Symbol
|
37
|
-
doc.fetch(opts[:label], "")
|
38
|
-
when String
|
39
|
-
opts[:label]
|
40
|
-
else
|
41
|
-
raise 'Invalid label argument'
|
42
|
-
end
|
43
|
-
|
44
|
-
if label.blank?
|
45
|
-
label = doc[:id]
|
46
|
-
end
|
47
|
-
|
48
|
-
link_to_with_data(label, catalog_path(doc[:id]), {:method => :put, :data => {:counter => opts[:counter]},:title=>opts[:title]})
|
49
|
-
end
|
50
34
|
|
51
35
|
# currently only used by the render_document_partial helper method (below)
|
52
36
|
def document_partial_name(document)
|
53
|
-
|
54
|
-
|
37
|
+
display_type = document[blacklight_config.show.display_type]
|
38
|
+
|
39
|
+
return 'default' unless display_type
|
40
|
+
|
41
|
+
display_type.first.gsub(/^[^\/]+\/[^:]+:/,"").underscore.pluralize
|
55
42
|
end
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
# based on the value of doc[:format]
|
60
|
-
# if this value is blank (nil/empty) the "default" is used
|
61
|
-
# if the partial is not found, the "default" partial is rendered instead
|
62
|
-
def render_document_partial(doc, action_name, locals={})
|
63
|
-
format = document_partial_name(doc)
|
64
|
-
begin
|
65
|
-
Rails.logger.debug("attempting to render #{format}/_#{action_name}")
|
66
|
-
render :partial=>"#{format}/#{action_name}", :locals=>{:document=>doc}.merge(locals)
|
67
|
-
rescue ActionView::MissingTemplate
|
68
|
-
Rails.logger.debug("rendering default partial catalog/_#{action_name}_partials/default")
|
69
|
-
render :partial=>"catalog/_#{action_name}_partials/default", :locals=>{:document=>doc}.merge(locals)
|
70
|
-
end
|
43
|
+
|
44
|
+
def document_partial_path_templates
|
45
|
+
["%2$s/%1$s"] + super
|
71
46
|
end
|
72
47
|
|
73
48
|
# Removing the [remove] link from the default selected facet display
|
74
49
|
def render_selected_facet_value(facet_solr_field, item)
|
75
|
-
content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected")
|
50
|
+
content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected label")
|
76
51
|
end
|
77
52
|
|
78
53
|
|
@@ -82,10 +57,10 @@ module Hydra
|
|
82
57
|
|
83
58
|
def render_facet_value(facet_solr_field, item, options ={})
|
84
59
|
if item.is_a? Array
|
85
|
-
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]) + ")"
|
86
|
-
else
|
87
|
-
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) + ")"
|
60
|
+
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]) + ")"
|
88
61
|
end
|
62
|
+
|
63
|
+
super
|
89
64
|
end
|
90
65
|
|
91
66
|
def render_complex_facet_value(facet_solr_field, item, options ={})
|
@@ -176,24 +151,11 @@ module Hydra
|
|
176
151
|
# Change the action to 'index' to send them back to
|
177
152
|
# catalog/index with their new facet choice.
|
178
153
|
def add_facet_params_and_redirect(field, value)
|
179
|
-
new_params =
|
180
|
-
|
181
|
-
# Delete page, if needed.
|
182
|
-
new_params.delete(:page)
|
154
|
+
new_params = super
|
183
155
|
|
184
156
|
# Delete :qt, if needed - added to resolve NPE errors
|
185
157
|
new_params.delete(:qt)
|
186
158
|
|
187
|
-
# Delete any request params from facet-specific action, needed
|
188
|
-
# to redir to index action properly.
|
189
|
-
Blacklight::Solr::FacetPaginator.request_keys.values.each do |paginator_key|
|
190
|
-
new_params.delete(paginator_key)
|
191
|
-
end
|
192
|
-
new_params.delete(:id)
|
193
|
-
|
194
|
-
# Force action to be index.
|
195
|
-
new_params[:action] = "index"
|
196
|
-
|
197
159
|
new_params
|
198
160
|
end
|
199
161
|
|
@@ -6,7 +6,7 @@ module Hydra
|
|
6
6
|
|
7
7
|
datastreams.each_value do |ds|
|
8
8
|
result << "<li>"
|
9
|
-
result << link_to(ds.label,
|
9
|
+
result << link_to(ds.label, hydra_asset_downloads_path(ds.pid, :download_id=>ds.dsid))
|
10
10
|
result << "</li>"
|
11
11
|
end
|
12
12
|
|
@@ -1,7 +1,5 @@
|
|
1
|
-
require 'mediashelf/active_fedora_helper'
|
2
1
|
require 'sanitize'
|
3
2
|
module Hydra::HydraAssetsHelperBehavior
|
4
|
-
include MediaShelf::ActiveFedoraHelper
|
5
3
|
|
6
4
|
# Create a link for creating a new asset of the specified content_type
|
7
5
|
# 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
|
|
9
7
|
# @param [String] content_type
|
10
8
|
def link_to_create_asset(link_label, content_type)
|
11
9
|
if current_user
|
12
|
-
link_to link_label,
|
10
|
+
link_to link_label, new_hydra_asset_path( :content_type => content_type), :class=>"create_asset"
|
13
11
|
else
|
14
12
|
link_to link_label, new_user_session_path(:redirect_params => {:action => "new", :controller=> "assets", :content_type => content_type}), :class=>"create_asset"
|
15
13
|
end
|
@@ -22,8 +20,8 @@ module Hydra::HydraAssetsHelperBehavior
|
|
22
20
|
end
|
23
21
|
|
24
22
|
def document_type(document)
|
25
|
-
if (document[
|
26
|
-
document[
|
23
|
+
if (document[blacklight_config.show.display_type])
|
24
|
+
document[blacklight_config.show.display_type].first.gsub("info:fedora/afmodel:","")
|
27
25
|
else ""
|
28
26
|
end
|
29
27
|
end
|
@@ -41,7 +39,8 @@ module Hydra::HydraAssetsHelperBehavior
|
|
41
39
|
|
42
40
|
def get_file_asset_count(document)
|
43
41
|
count = 0
|
44
|
-
obj =
|
42
|
+
obj = ActiveFedora::Base.load_instance_from_solr(document['id'], document)
|
43
|
+
#obj = load_af_instance_from_solr(document)
|
45
44
|
count += obj.file_objects.length unless obj.nil?
|
46
45
|
count
|
47
46
|
end
|
@@ -150,7 +150,7 @@ module Hydra::HydraHelperBehavior
|
|
150
150
|
end
|
151
151
|
|
152
152
|
def render_previous_workflow_steps
|
153
|
-
|
153
|
+
previous_show_partials(params[:wf_step]).map{|partial| render partial}.join
|
154
154
|
end
|
155
155
|
|
156
156
|
def render_submission_workflow_step
|
@@ -3,7 +3,7 @@ module Hydra::HydraUploaderHelperBehavior
|
|
3
3
|
# Generate the appropriate url for posting uploads to
|
4
4
|
# Uses the +container_id+ method to figure out what container uploads should go into
|
5
5
|
def upload_url
|
6
|
-
upload_url =
|
6
|
+
upload_url = hydra_asset_file_assets_path(:asset_id=>container_id)
|
7
7
|
end
|
8
8
|
|
9
9
|
# The id of the container that uploads should be posted into
|
data/app/models/mods_asset.rb
CHANGED
data/app/models/role_mapper.rb
CHANGED
@@ -2,8 +2,8 @@ require 'yaml'
|
|
2
2
|
class RoleMapper
|
3
3
|
@@map = YAML.load(File.open(File.join(Rails.root, "config/role_map_#{Rails.env}.yml")))
|
4
4
|
m = Hash.new{|h,k| h[k]=[]}
|
5
|
-
@@byname = @@map.inject(m) do|memo,
|
6
|
-
|
5
|
+
@@byname = @@map.inject(m) do|memo, (role,usernames)|
|
6
|
+
((usernames if usernames.respond_to?(:each)) || [usernames]).each { |x| memo[x]<<role}
|
7
7
|
memo
|
8
8
|
end
|
9
9
|
class << self
|
@@ -3,9 +3,9 @@
|
|
3
3
|
<% facet_name = grouping_facet %>
|
4
4
|
<%- if facet_name -%>
|
5
5
|
<%- @response.docs.group_by {|d| d[facet_name]}.each do |grouping| -%>
|
6
|
-
<%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1], :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
|
6
|
+
<%= 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} %>
|
7
7
|
<%- end -%>
|
8
8
|
<%- else -%>
|
9
|
-
<%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs, :facet_name => nil, :facet_value => nil} %>
|
9
|
+
<%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs.map { |x| SolrDocument.new(x) }, :facet_name => nil, :facet_value => nil} %>
|
10
10
|
<%- end -%>
|
11
11
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
|
2
2
|
|
3
3
|
<%# this should imitate the stuff in catalog/_show_partials/_default_details -%>
|
4
|
-
<%= form_tag
|
4
|
+
<%= form_tag hydra_update_url_for(:action=>"update", :controller=>"hydra/assets"), :id=>"document_metadata" "accept-charset"=>"utf-8" do %>
|
5
5
|
|
6
6
|
<div id="multipleEdit">
|
7
7
|
<dl class="defList fl-theme-mist">
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<tr class="document <%= cycle("even","odd") %>">
|
2
2
|
<td>
|
3
|
-
<%= link_to_document(document, :label =>
|
3
|
+
<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
|
4
4
|
</td>
|
5
5
|
<td>
|
6
6
|
|
@@ -22,4 +22,4 @@
|
|
22
22
|
<%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
|
23
23
|
<% end %>
|
24
24
|
|
25
|
-
<%= async_load_tag(
|
25
|
+
<%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<input id="re-run-add-contributor-action" type="button" value="Add a researcher" style="display:none"/>
|
4
4
|
<button id="select-contributor-type" type="button" style="display:none">Select type of contributor to add</button>
|
5
5
|
<ul id="add-contributor-menu">
|
6
|
-
<li id="add_person"><%= link_to "Add a Person",
|
7
|
-
<li id="add_organization"><%= link_to "Add an Organization",
|
8
|
-
<li id="add_conference"><%= link_to "Add a Conference",
|
6
|
+
<li id="add_person"><%= link_to "Add a Person", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"person") %></li>
|
7
|
+
<li id="add_organization"><%= link_to "Add an Organization", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"organization") %></li>
|
8
|
+
<li id="add_conference"><%= link_to "Add a Conference", new_hydra_asset_contributor_path(:asset_id=>params[:id], :contributor_type=>"conference") %></li>
|
9
9
|
</ul>
|
10
|
-
</div>
|
10
|
+
</div>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
</ul>
|
23
23
|
<% if params[:action] == "edit" && !conference_name.empty? %>
|
24
24
|
<%= field_selectors_for("descMetadata", [{:person=>conference_counter}]).html_safe %>
|
25
|
-
<a class="destructive destroy_contributor" href="<%=
|
25
|
+
<a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "conference", conference_counter) %>" title="Delete '<%= conference_name %>"> Delete</a>
|
26
26
|
<% end %>
|
27
27
|
</dd>
|
28
28
|
</dl>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
</ul>
|
23
23
|
<% if (params[:action] == "edit" && !organization_name.empty?) %>
|
24
24
|
<%= field_selectors_for("descMetadata", [{:person=>organization_counter}]).html_safe %>
|
25
|
-
<a class="destructive destroy_contributor" href="<%=
|
25
|
+
<a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>"> Delete</a>
|
26
26
|
<% end %>
|
27
27
|
</dd>
|
28
28
|
</dl>
|
@@ -33,7 +33,7 @@
|
|
33
33
|
|
34
34
|
<% if ( (person_counter > 0) && (params[:action] == "edit" || params[:action] == "create")) %>
|
35
35
|
<p class="delete-person"><%#= field_selectors_for("descMetadata", [{:person=>person_counter}]) %>
|
36
|
-
<%= link_to("Delete",
|
36
|
+
<%= 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") %>
|
37
37
|
</p>
|
38
38
|
<% end %>
|
39
39
|
</fieldset>
|
@@ -3,9 +3,9 @@
|
|
3
3
|
|
4
4
|
<%= render :partial=>"contributors/edit_person", :collection=>person_collection, :locals=>{:af_model => "mods_asset"} %>
|
5
5
|
|
6
|
-
<p id="add_author" class="add-multi"><%#= link_to "Add a Person",
|
6
|
+
<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>
|
7
7
|
|
8
8
|
<%#= render :partial=>"contributors/edit_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
|
9
9
|
|
10
|
-
<!--<p id="add_organization" class="add-multi"><%#= link_to "Add an Organization",
|
10
|
+
<!--<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>-->
|
11
11
|
|
@@ -15,7 +15,7 @@
|
|
15
15
|
<%= get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart]).first %>
|
16
16
|
|
17
17
|
<% if (params[:action] == "edit" && !organization_name.empty?) %>
|
18
|
-
<a class="destructive destroy_contributor" href="<%=
|
18
|
+
<a class="destructive destroy_contributor" href="<%= hydra_asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>">Delete</a>
|
19
19
|
<% end %>
|
20
20
|
</li>
|
21
|
-
<% end %>
|
21
|
+
<% end %>
|
@@ -4,11 +4,11 @@
|
|
4
4
|
<%# Calculating the new index so all field values (ie first name & last name) will be added to one contributor with that index %>
|
5
5
|
<%- new_contributor_index = @document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(ct.to_sym).length %>
|
6
6
|
|
7
|
-
<%= 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 %>
|
7
|
+
<%= 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 %>
|
8
8
|
<input name="_method" type="hidden" value="put" />
|
9
|
-
<%= render :partial=>"contributors/edit_#{ct}
|
9
|
+
<%= render :partial=>"contributors/edit_#{ct}", :locals=>{"edit_#{ct}".to_sym =>{}, "edit_#{ct}_counter".to_sym =>new_contributor_index} %>
|
10
10
|
<%= submit_tag "Add #{ct.capitalize}", {:id => "addContributor"} %>
|
11
11
|
<% end %>
|
12
12
|
<%- else %>
|
13
|
-
<%= render :partial=>"contributors/new
|
14
|
-
<%- end %>
|
13
|
+
<%= render :partial=>"contributors/new" %>
|
14
|
+
<%- end %>
|
@@ -1,7 +1,7 @@
|
|
1
|
-
<%= form_tag(url_for(:controller=>"assets", :action=>"update", :id=>params[:id]), :id=>"descriptive-metadata", :"data-resourceType"=>"mods_asset", :"accept-charset"=>"utf-8") do -%>
|
1
|
+
<%= form_tag(url_for(:controller=>"hydra/assets", :action=>"update", :id=>params[:id]), :id=>"descriptive-metadata", :"data-resourceType"=>"mods_asset", :"accept-charset"=>"utf-8") do -%>
|
2
2
|
<%= hidden_field_tag("_method","put") %>
|
3
3
|
<%= render "generic_content_objects/edit_description" %>
|
4
4
|
<%= hidden_field_tag(:wf_step, params[:wf_step]) %>
|
5
5
|
<%= hidden_field_tag(:content_type,"generic_content") %>
|
6
6
|
<%= submit_tag("Continue", :name=>"continue") %>
|
7
|
-
<%- end -%>
|
7
|
+
<%- end -%>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<tr class="document <%= cycle("even","odd") %>">
|
2
2
|
<td>
|
3
|
-
<%= link_to_document(document, :label =>
|
3
|
+
<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
|
4
4
|
</td>
|
5
5
|
<td>
|
6
6
|
<% creator = get_person_from_role(document, "Creator") %>
|
@@ -8,12 +8,12 @@
|
|
8
8
|
|
9
9
|
<h2 class="section-title">Upload Content</h2>
|
10
10
|
<div id="uploads">
|
11
|
-
<%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets} %>
|
11
|
+
<%= render :partial => "hydra/file_assets/index", :locals => { :file_assets => @file_assets} %>
|
12
12
|
</div>
|
13
13
|
|
14
14
|
<h2 class="section-title">Set Permissions</h2>
|
15
15
|
<div id="permissions_editor">
|
16
|
-
<%= render :partial => "permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
|
16
|
+
<%= render :partial => "hydra/permissions/index", :locals => {:document => document, :asset_id=>params[:id]} %>
|
17
17
|
</div>
|
18
18
|
|
19
19
|
<%#
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<td>
|
3
3
|
<img width="75" src="<%= datastream_disseminator_url(document[:id], "thumbnail") %>" alt="thumb">
|
4
4
|
|
5
|
-
<%= link_to_document(document, :label =>
|
5
|
+
<%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
|
6
6
|
|
7
7
|
</td>
|
8
8
|
<td>
|
File without changes
|
File without changes
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<%- if params.has_key?(:number_of_files) or !@file_assets.
|
2
|
-
<%= render :partial => "file_assets/index", :locals => { :file_assets => @file_assets } %>
|
1
|
+
<%- if params.has_key?(:number_of_files) or !@file_assets.empty? -%>
|
2
|
+
<%= render :partial => "hydra/file_assets/index", :locals => { :file_assets => @file_assets } %>
|
3
3
|
<%- end -%>
|
4
4
|
<%= form_tag(upload_url, :class => "step") do -%>
|
5
5
|
<%= label_tag "number_of_files", "Number of files add" %>
|
@@ -8,4 +8,4 @@
|
|
8
8
|
<%= hidden_field_tag(:new_asset, true, :id => "num_files_new_asset") if params[:new_asset] %>
|
9
9
|
<%= hidden_field_tag("id",params[:id], :id => "file_assets_id")%>
|
10
10
|
<%= submit_tag(submit_name, :name=>"continue")%>
|
11
|
-
<%- end -%>
|
11
|
+
<%- end -%>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<% unless file_assets.
|
1
|
+
<% unless file_assets.empty? %>
|
2
2
|
<table class='multipleEdit' id='file_assets'>
|
3
3
|
<tr>
|
4
4
|
<th colspan="2">File</th>
|
5
5
|
</tr>
|
6
|
-
<%= render :partial=>'file_assets/result', :collection=> file_assets
|
6
|
+
<%= render :partial=>'hydra/file_assets/result', :collection=> file_assets%>
|
7
7
|
</table>
|
8
8
|
<% end %>
|
9
9
|
|
@@ -15,7 +15,7 @@
|
|
15
15
|
<input type="hidden" name="container_id" value="<%=h container_id %>"/>
|
16
16
|
<%= hidden_field_tag("container_content_type", container_content_type, :id => "file_upload_content_type") if defined?(container_content_type) %>
|
17
17
|
<%- params[:number_of_files].to_i.times do -%>
|
18
|
-
<%= render :partial=>"file_assets/new"%>
|
18
|
+
<%= render :partial=>"hydra/file_assets/new"%>
|
19
19
|
<%- end -%>
|
20
20
|
<%= hidden_field_tag(:wf_step, params[:wf_step], :id => "files_wf_step") %>
|
21
21
|
<%= hidden_field_tag(:new_asset, true, :id => "files_new_asset") if params[:new_asset] %>
|
File without changes
|
File without changes
|
@@ -42,5 +42,5 @@
|
|
42
42
|
<% choice_name = choice.values.first %>
|
43
43
|
<% individual_permissions[choice_name] = get_values_from_datastream(@document_fedora,"rightsMetadata", ["#{choice_name}_access".to_sym, :person]) %>
|
44
44
|
<% end %>
|
45
|
-
<%= render :partial=>"permissions/edit_person_permissions
|
45
|
+
<%= render :partial=>"hydra/permissions/edit_person_permissions", :collection=>@document_fedora.datastreams["rightsMetadata"].find_by_terms(:access, :person) %>
|
46
46
|
</fieldset>
|
File without changes
|
@@ -1,7 +1,6 @@
|
|
1
1
|
<%- if params.has_key?(:add_permission) -%>
|
2
|
-
|
3
|
-
|
4
|
-
<%= render :partial=>"permissions/new.html" %>
|
2
|
+
<%= form_tag({:controller=>"hydra/permissions", :action=> "create", :asset_id=>params[:id]}, :class => "step") do -%>
|
3
|
+
<%= render :partial=>"hydra/permissions/new" %>
|
5
4
|
<%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
|
6
5
|
<%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
|
7
6
|
<%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
|
@@ -12,8 +11,8 @@
|
|
12
11
|
<% end %>
|
13
12
|
<%- end -%>
|
14
13
|
<%- else -%>
|
15
|
-
<%= form_tag({:controller=>"permissions", :action => "update"}, :id => "permissions_metadata", :class => "step") do -%>
|
16
|
-
<%= render :partial => "permissions/index" %>
|
14
|
+
<%= form_tag({:controller=>"hydra/permissions", :action => "update"}, :id => "permissions_metadata", :class => "step") do -%>
|
15
|
+
<%= render :partial => "hydra/permissions/index" %>
|
17
16
|
<%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
|
18
17
|
<%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
|
19
18
|
<%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
|
@@ -21,4 +20,4 @@
|
|
21
20
|
<%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
|
22
21
|
<%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
|
23
22
|
<%- end -%>
|
24
|
-
<%- end -%>
|
23
|
+
<%- end -%>
|