enju_subject 0.1.0.pre14 → 0.1.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53eb252d1fbc6832322d735d57b15b11aa63269
-  data.tar.gz: 9736eb6d6466b072718346f43e7e27f5827a4f67
+  metadata.gz: 550d30ae82251c10a2f2b81fc6969907f5fb05f7
+  data.tar.gz: 93560ce11842b3f23895bf845ffbfffb91478064
 SHA512:
-  metadata.gz: 6ff7f21843d3ea51a961d03d9fb4b54087caa3e66e69f05c174fbe62e4af4e106564d83ebad9df4605f742149032eb99bc725def840f8ba04ddc709bf11707a5
-  data.tar.gz: 4d0cee45a22718db76db002c067303aad88fbfc71fc4f416de65dadae46720e5bbad64ec99778e2665a5504312216dd811413243afd3d8f5b0603e81b11b07eb
+  metadata.gz: 27f174c4b96d85048e8a7ea410a35eb6f2a5ddf142ba5277dcd46aa57dcd3fa9f9d6baab65ded3033d51e4d46c4a8df3af3f758f1f951ef274ffd1efbf059cc0
+  data.tar.gz: 6ed425e86eb99d8633e60e4ac6acf9d0b16b40e2968a476c5bcf7b601938f8a5de758e6968ae41b9ec810292c4912f9e73c0d7e7006daa59f9289b6e95aef4c6

data/app/models/classification.rb

@@ -5,7 +5,6 @@ class Classification < ActiveRecord::Base
 
   validates_associated :classification_type
   validates_presence_of :category, :classification_type
-  validates_uniqueness_of :category, :scope => :classification_type_id
   searchable do
     text :category, :note
     integer :classification_type_id

data/app/models/subject.rb

@@ -8,7 +8,7 @@ class Subject < ActiveRecord::Base
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
 
   validates_associated :subject_type, :subject_heading_type
-  validates_presence_of :term, :subject_type_id #, :subject_heading_type_id
+  validates_presence_of :term, :subject_type_id, :subject_heading_type_id
 
   searchable do
     text :term

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

@@ -23,8 +23,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.classification')), classification_type_classifications_path(@classification_type) -%></li>
-    <li><%= link_to t('page.edit'), edit_classification_type_path(@classification_type) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.edit'), edit_classification_type_path(@classification_type) -%></li>
   </ul>
 </div>

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre14"
+  VERSION = "0.1.0.pre15"
 end

data/spec/factories/subject.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :subject do |f|
     f.sequence(:term){|n| "subject_#{n}"}
+    f.subject_heading_type_id{FactoryGirl.create(:subject_heading_type).id}
     f.subject_type_id{FactoryGirl.create(:subject_type).id}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre14
+  version: 0.1.0.pre15
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -403,7 +403,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_1ss
+- spec/dummy/solr/data/test/index/segments_1ux
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -628,7 +628,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_1ss
+- spec/dummy/solr/data/test/index/segments_1ux
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml