app/models/enju_circulation/ability.rb in enju_circulation-0.1.0.pre31 vs app/models/enju_circulation/ability.rb in enju_circulation-0.1.0.pre32

@@ -6,10 +6,13 @@
       case user.try(:role).try(:name)
       when 'Administrator'
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?
         end
+        can [:destroy, :delete], Item do |item|
+          true if item.removable?
+        end
         can :manage, [
           Basket,
           CarrierTypeHasCheckoutType,
           CheckedItem,
           Checkin,
@@ -36,10 +39,10 @@
           UseRestriction
         ]
         can [:destroy, :delete], LendingPolicy
       when 'Librarian'
         can [:destroy, :delete], Item do |item|
-          item.checkouts.not_returned.empty?
+          true if item.removable?
         end
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.series_master? and !manifestation.is_reserved?
         end
         can :manage, [