enju_library 0.1.2 → 0.2.0.beta.1

data/app/models/request_type.rb

@@ -1,7 +1,6 @@
 class RequestType < ActiveRecord::Base
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
-  default_scope { order('request_types.position') }
 
   private
   def valid_name?

data/app/models/search_engine.rb

@@ -1,5 +1,4 @@
 class SearchEngine < ActiveRecord::Base
-  default_scope { order('search_engines.position') }
   acts_as_list
 
   validates :name, presence: true

data/app/models/withdraw.rb

@@ -3,15 +3,19 @@ class Withdraw < ActiveRecord::Base
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
 
-  enju_circulation_withdraw_model if defined?(EnjuCirculation)
-
-  validates_uniqueness_of :item_id, message:  I18n.t('withdraw.already_withdrawn')
-  validates_presence_of :item_id, message:  I18n.t('withdraw.item_not_found')
+  validates :item_id,
+    uniqueness: true, #{ message: I18n.t('withdraw.already_withdrawn', locale: I18n.default_locale) },
+    presence: true #, { message: I18n.translate('withdraw.item_not_found', locale: I18n.default_locale) }
   validates_presence_of :basket_id
+  validate :check_item
 
   attr_accessor :item_identifier
 
   paginates_per 10
+
+  def check_item
+    errors.add(:item) if item.try(:rent?)
+  end
 end
 
 # == Schema Information

data/app/policies/accept_policy.rb

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

data/app/policies/basket_policy.rb

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

data/app/policies/bookstore_policy.rb

@@ -0,0 +1,23 @@
+class BookstorePolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Administrator')
+      true if record.items.empty?
+    end
+  end
+end

data/app/policies/budget_type_policy.rb

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

data/app/policies/library_group_policy.rb

@@ -0,0 +1,23 @@
+class LibraryGroupPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Administrator')
+      true if record.shelves.empty? && !record.web?
+    end
+  end
+end

data/app/policies/library_policy.rb

@@ -0,0 +1,25 @@
+class LibraryPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Administrator')
+      if record.profiles.empty?
+        true if record.shelves.empty? && !record.web?
+      end
+    end
+  end
+end

data/app/policies/request_status_type_policy.rb

@@ -0,0 +1,21 @@
+class RequestStatusTypePolicy < 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?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/policies/request_type_policy.rb

@@ -0,0 +1,21 @@
+class RequestTypePolicy < 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?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/policies/search_engine_policy.rb

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

data/app/policies/shelf_policy.rb

@@ -0,0 +1,23 @@
+class ShelfPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    if user.try(:has_role?, 'Administrator')
+      true if record.items.empty? && !record.web_shelf?
+    end
+  end
+end

data/app/policies/subscribe_policy.rb

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

data/app/policies/subscription_policy.rb

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

data/app/policies/withdraw_policy.rb

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

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

@@ -29,7 +29,7 @@
         <% end %>
       </td>
       <td>
-        <%- if can? :delete, accept -%>
+        <%- if policy(accept).destroy? -%>
           <%= link_to t('page.destroy'), accept, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>

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

@@ -26,6 +26,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

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

@@ -25,6 +25,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
-    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
+    <li><%= link_to t('page.back'), baskets_path(user_id: @basket.user.username) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('activerecord.models.checkin'), new_checkin_path -%></li>
+    <% if defined?(EnjuCirculation) %>
+      <li><%= link_to t('page.new', model: t('activerecord.models.checkin')), new_checkin_path -%></li>
+    <% end %>
     <li><%= link_to t('page.search_resource', model: t('activerecord.models.profile')), profiles_path -%></li>
   </ul>
 </div>

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

@@ -14,7 +14,7 @@
 <%- @bookstores.each_with_index do |bookstore, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, bookstore -%>
+      <%- if policy(bookstore).update? -%>
         <%= move_position(bookstore) -%>
       <%- end -%>
     </td>
@@ -25,10 +25,10 @@
     <td><%= bookstore.telephone_number -%></td>
     <td><%= bookstore.fax_number -%></td>
     <td>
-      <%- if can? :update, bookstore -%>
+      <%- if policy(bookstore).update? -%>
         <%= link_to t('page.edit'), edit_bookstore_path(bookstore) -%>
       <% end %>
-      <%- if can? :delete, bookstore -%>
+      <%- if policy(bookstore).destroy? -%>
         <%= link_to t('page.destroy'), bookstore, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -41,7 +41,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, Bookstore -%>
+  <%- if policy(Bookstore).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.bookstore')), new_bookstore_path -%></li>
     </ul>

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

@@ -43,10 +43,10 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @bookstore -%>
+    <%- if policy(@bookstore).update? -%>
       <li><%= link_to t('page.edit'), edit_bookstore_path(@bookstore) -%></li>
     <%- end -%>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
     <% if defined?(EnjuPurchaseRequest) %>
       <li><%= link_to t('activerecord.models.order_list'), bookstore_order_lists_path(@bookstore) -%></li>
     <% end %>

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

@@ -14,7 +14,7 @@
 <%- @budget_types.each do |budget_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, budget_type -%>
+      <%- if policy(budget_type).update? -%>
         <%= move_position(budget_type) -%>
       <%- end -%>
     </td>
@@ -22,10 +22,10 @@
     <td><%= link_to budget_type.display_name.localize, budget_type -%></td>
     <td><%= budget_type.note -%></td>
     <td>
-      <%- if can? :update, budget_type -%>
+      <%- if policy(budget_type).update? -%>
         <%= link_to t('page.edit'), edit_budget_type_path(budget_type) -%>
       <% end %>
-      <%- if can? :delete, budget_type -%>
+      <%- if policy(budget_type).destroy? -%>
         <%= link_to t('page.destroy'), budget_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -38,7 +38,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, BudgetType -%>
+    <%- if policy(BudgetType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.budget_type')), new_budget_type_path -%></li>
     <%- end -%>
   </ul>

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

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

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

@@ -40,7 +40,7 @@
 <%- @libraries.each_with_index do |library, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can?(:update, library) and params[:query].blank? -%>
+      <%- if policy(library).update? and params[:query].blank? -%>
         <%= library.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: library.name}, method: :put) -%>
         <%= library.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: library.name}, method: :put) -%>
       <%- end -%>
@@ -66,10 +66,10 @@
       <% end %>
     </td>
     <td>
-      <%- if can? :update, library -%>
+      <%- if policy(library).update? -%>
         <%= link_to t('page.edit'), edit_library_path(library) -%>
       <% end %>
-      <%- if can? :delete, library -%>
+      <%- if policy(library).destroy? -%>
         <%= link_to t('page.destroy'), library, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -83,7 +83,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Library -%>
+    <%- if policy(Library).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.library')), new_library_path -%></li>
     <%- end -%>
   </ul>

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

@@ -36,7 +36,7 @@
         <% if defined?(EnjuEvent) %>
           <li><a href="#tab4"><em><%= t('activerecord.models.event') -%></em></a></li>
         <% end %>
-        <%- if can? :update, @library -%>
+        <%- if policy(@library).update? -%>
           <li><a href="#tab5"><em><%= t('page.configuration') -%></em></a></li>
         <%- end -%>
       </ul>
@@ -97,7 +97,7 @@
         </div>
       <% end %>
 
-      <%- if can? :update, @library -%>
+      <%- if policy(@library).update? -%>
         <div id="tab5">
           <h3><%= t('page.configuration') -%></h3>
           <p>
@@ -119,15 +119,15 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-  <%- if can? :update, @library -%>
+  <%- if policy(@library).update? -%>
     <li><%= link_to t('page.edit'), edit_library_path(@library) -%></li>
   <%- end -%>
 
-  <%- if can? :create, Shelf and !@library.web? -%>
+  <%- if policy(Shelf).create? and !@library.web? -%>
     <li><%= link_to t('page.new', model: t('activerecord.models.shelf')), new_shelf_path(library_id: @library.id) -%></li>
   <%- end -%>
   <% if defined?(EnjuEvent) %>
-    <%- if can? :create, Event and !@library.web? -%>
+    <%- if policy(Event).create? and !@library.web? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.event')), new_event_path(library_id: @library.id) -%></li>
     <%- end -%>
   <%- end -%>

data/app/views/library_groups/_color_fields.html.erb

@@ -0,0 +1,5 @@
+<div class="nested-fields">
+  <%= f.text_field :property, disabled: true %>
+  <%= f.text_field :code %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/library_groups/_form.html.erb

@@ -21,10 +21,19 @@
     <%= f.url_field :url, class: 'resource_url' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :login_banner -%><br />
-    <%= f.text_area :login_banner -%>
-  </div>
+  <% @available_languages.each do |language| -%>
+    <div class="field">
+      <%= f.label :login_banner -%> (<%= language.display_name.localize -%>)<br />
+      <%= f.text_area LibraryGroup.localized_attr_name_for(:login_banner, language.iso_639_1) -%>
+    </div>
+  <% end -%>
+
+  <% @available_languages.each do |language| -%>
+    <div>
+      <%= f.label :footer_banner -%> (<%= language.display_name.localize -%>)<br />
+      <%= f.text_area LibraryGroup.localized_attr_name_for(:footer_banner, language.iso_639_1) -%>
+    </div>
+  <% end -%>
 
   <div class="field">
     <%= f.label :max_number_of_results -%><br />
@@ -39,10 +48,11 @@
   <div class="field">
     <%= f.label :color -%><br />
     <%= f.fields_for :colors do |color_form| %>
-      <%= color_form.text_field :property, disabled: true %>
-      <%= color_form.text_field :code %>
-      <br />
+      <%= render 'color_fields', f: color_form %>
     <% end %>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :colors %></p>
+    </div>
   </div>
 
   <div class="field">

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

@@ -7,6 +7,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back'), library_groups_path -%></li>
+    <li><%= link_to t('page.show'), @library_group -%></li>
   </ul>
 </div>

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

@@ -16,7 +16,7 @@
     <td><%= library_group.name -%></td>
     <td><%= library_group.user.email -%></td>
     <td>
-      <%= link_to t('page.edit'), edit_library_group_path(library_group) if can?(:update, library_group) -%>
+      <%= link_to t('page.edit'), edit_library_group_path(library_group) if policy(library_group).update? -%>
     </td>
   </tr>
 <%- end -%>

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

@@ -28,6 +28,11 @@
   <%= markdown_helper(@library_group.login_banner) -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.library_group.footer_banner') -%>:</strong>
+  <%= markdown_helper(@library_group.footer_banner) -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.library_group.max_number_of_results') -%>:</strong>
   <%= @library_group.max_number_of_results -%>
@@ -88,9 +93,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @library_group -%>
+    <%- if policy(@library_group).update? -%>
       <li><%= link_to t('page.edit'), edit_library_group_path(@library_group) -%></li>
     <%- end -%>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>