Skip to content

Commit bd5c93e

Browse files
author
Ferdinando Primerano
committed
Merge branch 'hotfix-0.10.1'
2 parents 682d190 + e07e84f commit bd5c93e

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
### 0.10.1 - E-Library bug fix (deleting documents)
2+
13
### 0.10.0 - E-Library
24

35
### 0.9.6.4

app/assets/javascripts/species/templates/elibrary_search_form.handlebars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<fieldset>
2222
<div class="documents-control-group">
2323
<div class="location-area popup-area">
24-
<label>Country <i class="fa fa-info-circle" title="Including territories and historic names"></i></label>
24+
<label>Countries and territories <i class="fa fa-info-circle" title="Including historic names"></i></label>
2525
{{view Species.GeoEntitiesSearchButton
2626
selectedGeoEntitiesBinding="controller.selectedGeoEntities"
2727
loadedBinding="geoEntities.loaded"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
class ChangeForeignKeyConstraintOnDeleteInDocumentDetails < ActiveRecord::Migration
2+
def change
3+
remove_foreign_key(:proposal_details, :documents)
4+
remove_foreign_key(:review_details, :documents)
5+
add_foreign_key(:proposal_details, :documents, dependent: :delete)
6+
add_foreign_key(:review_details, :documents, dependent: :delete)
7+
end
8+
end

0 commit comments

Comments
 (0)