enju_subject 0.1.0.pre6 → 0.1.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3fbd0d3b98bafeb64ba65c66d786198cf02d81
-  data.tar.gz: 03e8e768a6ee6ab072aad5bc5fc33cf4b9d7391c
+  metadata.gz: 3c944887efaf78d8871e5dbf5f6577b792261409
+  data.tar.gz: a5c431d2772f71898a06dfae749eef5b5aec3929
 SHA512:
-  metadata.gz: 7a1d84d4be7cc56d4f938f835589c29a8ae737d9941574e50275e7e54296bd19c29a1265138fda50790e758a0da76e82d2f2ff99ff0379a0d0435967a1112e83
-  data.tar.gz: 2d1aef73854ab35545774f28924cd3aa83aaf5aab9f2e557d73129d12ba3e5e9cdf969d6ca86ab51c7641c7b97cc07695393466da014db149bd3d24dab5e5954
+  metadata.gz: 1c591ca724c4ad98edd01a57ad1d44dde8581a0b1443b86fcbf7909431abe4238178e8e3710ce19aeca9ed4ca5172ab515b979ddfd1f21a17b30a856b18bcd3d
+  data.tar.gz: a47c6a4ff4ae8dae0e67de7b0d7c7b304bf1c0a06a721ceea3cf7871d6c5fe45b17b7a9e77c23b7121213fe3f728cb51cf99b1e00147f933927d0dfbe3e6200f

data/app/models/enju_subject/ability.rb

@@ -14,7 +14,7 @@ module EnjuSubject
         can :manage, WorkHasSubject
         if LibraryGroup.site_config.network_access_allowed?(ip_address)
           can [:read, :create, :update], ClassificationType
-          can :destroy, ClassificationType do |classification_type|
+          can [:destroy, :delete], ClassificationType do |classification_type|
             classification_type.classifications.empty?
           end
           can :manage, [

data/app/views/classification_types/index.html.erb

@@ -25,7 +25,7 @@
       <%- if can? :update, classification_type -%>
         <%= link_to t('page.edit'), edit_classification_type_path(classification_type) -%>
       <% end %>
-      <%- if can? :destroy, classification_type -%>
+      <%- if can? :delete, classification_type -%>
         <%= link_to t('page.destroy'), classification_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/app/views/classifications/_index.html.erb

@@ -25,7 +25,7 @@
     <td><%= classification.note -%></td>
     <td><%= link_to classification.classification_type.display_name.localize, classification.classification_type -%></td>
     <td>
-      <%- if can? :destroy, classification -%>
+      <%- if can? :delete, classification -%>
         <%= link_to t('page.edit'), edit_classification_path(classification) -%>
         <%= link_to t('page.destroy'), classification, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/classifications/_index_subject.html.erb

@@ -31,12 +31,12 @@
     <td><%= classification.note -%></td>
     <td><%= classification.classification_type.display_name.localize -%></td>
     <td>
-      <%- if can? :destroy, classification -%>
+      <%- if can? :delete, classification -%>
         <%= link_to t('page.edit'), edit_classification_path(classification) -%>
       <% end %>
     </td>
     <td>
-      <%- if can? :destroy, classification -%>
+      <%- if can? :delete, classification -%>
         <%- if params[:mode] == 'add' -%>
           <%= link_to t('page.add'), new_subject_subject_has_classification_path(@subject, :classification_id => classification.id) unless @subject.classifications.include?(classification) -%>
         <%- else -%>

data/app/views/subject_has_classifications/index.html.erb

@@ -16,7 +16,7 @@
     <td><%= link_to subject_has_classification.classification.category, subject_has_classification.classification -%></td>
     <td><%= link_to t('page.show'), subject_has_classification -%></td>
     <td>
-      <% if can? :destroy, subject_has_classification %>
+      <% if can? :delete, subject_has_classification %>
         <%= link_to t('page.edit'), edit_subject_has_classification_path(subject_has_classification) -%>
         <%= link_to t('page.destroy'), subject_has_classification, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>

data/app/views/subject_heading_types/index.html.erb

@@ -25,7 +25,7 @@
       <%- if can? :update, subject_heading_type -%>
         <%= link_to t('page.edit'), edit_subject_heading_type_path(subject_heading_type) -%>
       <% end %>
-      <%- if can? :destroy, subject_heading_type -%>
+      <%- if can? :delete, subject_heading_type -%>
         <%= link_to t('page.destroy'), subject_heading_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/app/views/subject_types/index.html.erb

@@ -25,7 +25,7 @@
       <%- if can? :update, subject_type -%>
         <%= link_to t('page.edit'), edit_subject_type_path(subject_type) -%>
       <% end %>
-      <%- if can? :destroy, subject_type -%>
+      <%- if can? :delete, subject_type -%>
         <%= link_to t('page.destroy'), subject_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/app/views/subjects/_index.html.erb

@@ -23,7 +23,7 @@
         <%- if can? :update, subject -%>
           <%= link_to t('page.edit'), edit_subject_path(subject) -%>
         <%- end -%>
-        <%- if can? :destroy, subject -%>
+        <%- if can? :delete, subject -%>
           <%= link_to t('page.destroy'), subject, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre6"
+  VERSION = "0.1.0.pre7"
 end

data/spec/dummy/app/models/ability.rb

@@ -14,7 +14,7 @@
         can :manage, WorkHasSubject
         if LibraryGroup.site_config.network_access_allowed?(ip_address)
           can [:read, :create, :update], ClassificationType
-          can :destroy, ClassificationType do |classification_type|
+          can [:destroy, :delete], ClassificationType do |classification_type|
             classification_type.classifications.empty?
           end
           can :manage, [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre6
+  version: 0.1.0.pre7
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -420,7 +420,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_14k
+- spec/dummy/solr/data/test/index/segments_166
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -654,7 +654,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_14k
+- spec/dummy/solr/data/test/index/segments_166
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml