enju_subject 0.1.0.pre24 → 0.1.0.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e095c1f11c2056f35713255e643e3a5c53035583
-  data.tar.gz: 87b68767010dd8beda5ffd4ae3c158320f19d2a0
+  metadata.gz: 58fa31fc46e6086be90f44cd2c0bdfc8879e1c86
+  data.tar.gz: fd2aae3d6bf163b0ad4e955aba991ef1c215a3c5
 SHA512:
-  metadata.gz: 6b5a621cad972f9757fb3c9a2a65a36c244065fa2a91598af6ebd448e05432fad616a0d7215a118bced0e921de640eb79edb730a574f69fd2a5811a75151e02b
-  data.tar.gz: 66c2e2008d6b18a06050ce336c2c96833ccb7b861990137bfa1b7a8acc4959df6e6cd371a34464d0c57a3e49d31db2e4c7aa9e92c388a3bd9ef0b10325de3e43
+  metadata.gz: a6be2c158c82d531e1a8606155d86cd79483ca5b0055c3f809f978af10b7ed90c8ce2ae21c19c754389992d6287c895b99047b649b453b4f1f9a1ac627d7e34b
+  data.tar.gz: 898e1dcd59613aa9cc8aa211c2222cff7d99ebf07671a6b5d2dfbb73e4e113eb67f6abb73c5b4f1e1968311a36f58f18ecc74387925ad3b4c8523aa12b72459b

data/app/controllers/subjects_controller.rb

@@ -2,7 +2,7 @@
 class SubjectsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :prepare_options, :only => :new
+  before_filter :prepare_options, :only => [:new, :edit]
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
 
@@ -134,5 +134,6 @@ class SubjectsController < ApplicationController
   private
   def prepare_options
     @subject_heading_types = SubjectHeadingType.select([:id, :display_name, :position])
+    @subject_types = SubjectType.select([:id, :display_name, :position])
   end
 end

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @classification_type -%></li>
     <li><%= link_to t('page.back'), classification_types_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
 
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, ClassificationType -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.classification_type')), new_classification_type_path -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), classification_types_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.classification_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <li><%= link_to t('page.edit'), edit_classification_type_path(@classification_type) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @classification -%></li>
     <li><%= link_to t('page.back'), classifications_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
 
@@ -39,7 +39,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Classification -%>
       <%- if @classification_type -%>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%=  t('page.new', :model => t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), :back -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.classification')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_classification_path(@classification) %></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @subject_heading_type -%></li>
     <li><%= link_to t('page.back'), subject_heading_types_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
 
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.subject_heading_type')), new_subject_heading_type_path -%></li>
   </ul>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), subject_heading_types_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subject_heading_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_subject_heading_type_path(@subject_heading_type) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @subject_type -%></li>
     <li><%= link_to t('page.back'), subject_types_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
 
@@ -36,8 +36,10 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.subject_type')), new_subject_type_path -%></li>
+    <% if can? :create, SubjectType %>
+      <li><%= link_to t('page.new', :model => t('activerecord.models.subject_type')), new_subject_type_path -%></li>
+    <% end %>
   </ul>
 </div>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), subject_types_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subject_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_subject_type_path(@subject_type) %></li>
     <li><%= back_to_index(flash[:page_info]) %></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @subject -%></li>
     <li><%= link_to t('page.back'), subjects_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
   
@@ -35,7 +35,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Subject -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.subject')), new_subject_path -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), subjects_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subject')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -25,10 +25,14 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <li><%= link_to t('page.edit'), edit_subject_path(@subject) -%></li>
-    <li><%= link_to t('page.destroy'), subject_path(@subject), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+    <% if can? :update, @subject %>
+      <li><%= link_to t('page.edit'), edit_subject_path(@subject) -%></li>
+    <% end %>
+    <% if can? :delete, @subject %>
+      <li><%= link_to t('page.destroy'), subject_path(@subject), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+    <% end %>
   </ul>
 </div>

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre24"
+  VERSION = "0.1.0.pre25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre24
+  version: 0.1.0.pre25
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre9
+        version: 0.1.1.pre10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre9
+        version: 0.1.1.pre10
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc9
+        version: 1.1.0.rc10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc9
+        version: 1.1.0.rc10
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -387,17 +387,17 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_u0
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001069
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001070
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001071
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001072
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001073
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001074
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001075
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001076
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001077
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001078
+- spec/dummy/solr/default/data/index/segments_v9
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001114
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001115
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001116
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001117
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001118
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001119
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001120
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001121
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001122
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001123
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml
@@ -652,17 +652,17 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_u0
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001069
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001070
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001071
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001072
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001073
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001074
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001075
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001076
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001077
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001078
+- spec/dummy/solr/default/data/index/segments_v9
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001114
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001115
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001116
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001117
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001118
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001119
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001120
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001121
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001122
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001123
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml