enju_event 0.1.19 → 0.2.0.beta.1

data/app/models/event_export_file_transition.rb

@@ -11,10 +11,10 @@ end
 # Table name: event_export_file_transitions
 #
 #  id                   :integer          not null, primary key
-#  to_state             :string(255)
-#  metadata             :text             default("{}")
+#  to_state             :string
+#  metadata             :text             default({})
 #  sort_key             :integer
 #  event_export_file_id :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #

data/app/models/event_import_file.rb

@@ -33,7 +33,6 @@ class EventImportFile < ActiveRecord::Base
 
   has_many :event_import_file_transitions
 
-  enju_import_file_model
   attr_accessor :mode
 
   def state_machine
@@ -208,21 +207,21 @@ end
 #
 #  id                        :integer          not null, primary key
 #  parent_id                 :integer
-#  content_type              :string(255)
+#  content_type              :string
 #  size                      :integer
 #  user_id                   :integer
 #  note                      :text
 #  executed_at               :datetime
-#  event_import_file_name    :string(255)
-#  event_import_content_type :string(255)
+#  event_import_file_name    :string
+#  event_import_content_type :string
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
-#  edit_mode                 :string(255)
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
-#  event_import_fingerprint  :string(255)
+#  edit_mode                 :string
+#  created_at                :datetime
+#  updated_at                :datetime
+#  event_import_fingerprint  :string
 #  error_message             :text
-#  user_encoding             :string(255)
+#  user_encoding             :string
 #  default_library_id        :integer
 #  default_event_category_id :integer
 #

data/app/models/event_import_file_transition.rb

@@ -11,10 +11,10 @@ end
 # Table name: event_import_file_transitions
 #
 #  id                   :integer          not null, primary key
-#  to_state             :string(255)
-#  metadata             :text             default("{}")
+#  to_state             :string
+#  metadata             :text             default({})
 #  sort_key             :integer
 #  event_import_file_id :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #

data/app/models/event_import_result.rb

@@ -17,7 +17,6 @@ end
 #  event_import_file_id :integer
 #  event_id             :integer
 #  body                 :text
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #
-

data/app/models/participate.rb

@@ -17,7 +17,6 @@ end
 #  agent_id   :integer          not null
 #  event_id   :integer          not null
 #  position   :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
-

data/app/models/place.rb

@@ -0,0 +1,18 @@
+class Place < ActiveRecord::Base
+  has_many :events
+  validates :term, presence: true
+end
+
+# == Schema Information
+#
+# Table name: places
+#
+#  id         :integer          not null, primary key
+#  term       :string
+#  city       :text
+#  country_id :integer
+#  latitude   :float
+#  longitude  :float
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/app/policies/event_category_policy.rb

@@ -0,0 +1,23 @@
+class EventCategoryPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Administrator')
+      true if !['unknown', 'closed'].include?(record.name)
+    end
+  end
+end

data/app/policies/event_export_file_policy.rb

@@ -0,0 +1,21 @@
+class EventExportFilePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/event_import_file_policy.rb

@@ -0,0 +1,21 @@
+class EventImportFilePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/event_import_result_policy.rb

@@ -0,0 +1,21 @@
+class EventImportResultPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    false
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/policies/event_policy.rb

@@ -0,0 +1,21 @@
+class EventPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/participate_policy.rb

@@ -0,0 +1,21 @@
+class ParticipatePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/place_policy.rb

@@ -0,0 +1,21 @@
+class PlacePolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

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

@@ -17,7 +17,7 @@
 <%- @event_categories.each do |event_category| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, event_category -%>
+      <%- if policy(event_category).update? -%>
         <%= move_position(event_category) -%>
       <%- end -%>
     </td>
@@ -28,10 +28,10 @@
       <%= event_category.note %>
     </td>
     <td>
-      <%- if can? :update, event_category -%>
+      <%- if policy(event_category).update? -%>
         <%= link_to t('page.edit'), edit_event_category_path(event_category) -%>
       <% end %>
-      <%- if can? :delete, event_category -%>
+      <%- if policy(event_category).destroy? -%>
         <%= link_to t('page.destroy'), event_category_path(event_category), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -44,7 +44,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, EventCategory -%>
+    <%- if policy(EventCategory).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.event_category')), new_event_category_path -%></li>
     <%- end -%>
   </ul>

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

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @event_category -%>
+    <%- if policy(@event_category).update? -%>
       <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/events/_calendar.html.erb

@@ -6,7 +6,7 @@
 <script>
   $(document).ready(function() {
     $('#calendar').fullCalendar({
-      events: '<%= url_for(params.merge(format: :json, only_path: true)) %>',
+      events: '<%= url_for(params.permit.merge(format: :json, only_path: true)) %>',
       lang: '<%= @locale.to_s %>'
     });
   });

data/app/views/events/{index.mobile.erb → index.html+phone.erb}

@@ -21,17 +21,17 @@
 <p>
   <%- case params[:mode]
       when 'upcoming' -%>
-    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
+    <%= link_to t('event.all'), url_for(params.permit.merge(mode: nil, only_path: true)) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
+    <%= link_to t('event.past'), url_for(params.permit.merge(mode: 'past', only_path: true)) -%>
   <%- when 'past' -%>
-    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
-    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
+    <%= link_to t('event.all'), url_for(params.permit.merge(mode: nil, only_path: true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.permit.merge(mode: 'upcoming', only_path: true)) -%>
     <strong><%= t('event.past') -%></strong>
   <%- else -%>
     <strong><%= t('event.all') -%></strong>
-    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
-    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.permit.merge(mode: 'upcoming', only_path: true)) -%>
+    <%= link_to t('event.past'), url_for(params.permit.merge(mode: 'past', only_path: true)) -%>
   <%- end -%>
 </p>
 </div>

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

@@ -22,17 +22,17 @@
   <p>
     <%- case params[:mode]
       when 'upcoming' -%>
-      <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
+      <%= link_to t('event.all'), url_for(params.permit.merge(mode: nil, only_path: true)) -%>
       <strong><%= t('event.upcoming') -%></strong>
-      <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
+      <%= link_to t('event.past'), url_for(params.permit.merge(mode: 'past', only_path: true)) -%>
     <%- when 'past' -%>
-      <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
-      <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
+      <%= link_to t('event.all'), url_for(params.permit.merge(mode: nil, only_path: true)) -%>
+      <%= link_to t('event.upcoming'), url_for(params.permit.merge(mode: 'upcoming', only_path: true)) -%>
       <strong><%= t('event.past') -%></strong>
     <%- else -%>
       <strong><%= t('event.all') -%></strong>
-      <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
-      <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
+      <%= link_to t('event.upcoming'), url_for(params.permit.merge(mode: 'upcoming', only_path: true)) -%>
+      <%= link_to t('event.past'), url_for(params.permit.merge(mode: 'past', only_path: true)) -%>
     <%- end -%>
   </p>
 
@@ -58,10 +58,10 @@
         <%= l(event.end_at, format: :short) -%>
       </td>
       <td>
-        <%- if can? :update, event -%>
+        <%- if policy(event).update? -%>
           <%= link_to t('page.edit'), edit_event_path(event) -%>
-        <%- end -%>
-        <%- if can? :destroy, event -%>
+        <% end %>
+        <%- if policy(event).destroy? -%>
           <%= link_to t('page.destroy'), event, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -77,9 +77,9 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <% if params[:mode] == 'calendar' %>
-      <li><%= link_to t('event.table'), url_for(params.merge(mode: nil)) -%></li>
+      <li><%= link_to t('event.table'), url_for(params.permit.merge(mode: nil)) -%></li>
     <% else %>
-      <li><%= link_to t('event.calendar'), url_for(params.merge(mode: 'calendar')) -%></li>
+      <li><%= link_to t('event.calendar'), url_for(params.permit.merge(mode: 'calendar')) -%></li>
     <% end %>
   </ul>
   <ul>
@@ -119,5 +119,4 @@
       (<%= link_to 'iCalendar', events_path(format: :ics, locale: @locale.to_s) -%>)
     <%- end -%>
   </p>
-  <%= render 'page/login' unless current_user -%>
 </div>

data/app/views/events/index.rss.builder

@@ -4,11 +4,11 @@ xml.rss('version' => "2.0",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('event.library_group_event', library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: events_url
     #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?

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

@@ -55,10 +55,10 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can?(:update, @event) -%>
+    <%- if policy(@event).update? -%>
       <li><%= link_to t('page.edit'), edit_event_path(@event) -%></li>
     <% end %>
-    <%- if can?(:destroy, @event) -%>
+    <% if policy(@event).destroy? %>
       <li><%= link_to t('page.destroy'), @event, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/picture_files/_index_event.html.erb

@@ -17,7 +17,7 @@
   <%- @picture_files.each do |picture_file| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= move_position(picture_file) -%>
         <%- end -%>
       </td>
@@ -29,10 +29,10 @@
       <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :delete, picture_file -%>
+        <%- if policy(picture_file).destroy? -%>
           <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -45,7 +45,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, PictureFile -%>
+  <%- if policy(PictureFile).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(event_id: event.id) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>