enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/app/controllers/users_controller.rb

@@ -1,195 +0,0 @@
-# -*- encoding: utf-8 -*-
-class UsersController < ApplicationController
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :get_agent, :only => :new
-  before_filter :store_location, :only => [:index]
-  before_filter :clear_search_sessions, :only => [:show]
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :user_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /users
-  # GET /users.json
-  def index
-    query = flash[:query] = params[:query].to_s
-    @query = query.dup
-    @count = {}
-
-    sort = {:sort_by => 'created_at', :order => 'desc'}
-    case params[:sort_by]
-    when 'username'
-      sort[:sort_by] = 'username'
-    end
-    case params[:order]
-    when 'asc'
-      sort[:order] = 'asc'
-    when 'desc'
-      sort[:order] = 'desc'
-    end
-
-    query = params[:query]
-    page = params[:page] || 1
-    role = current_user.try(:role) || Role.default_role
-
-    search = User.search
-    search.build do
-      fulltext query if query
-      order_by sort[:sort_by], sort[:order]
-      with(:required_role_id).less_than_or_equal_to role.id
-    end
-    search.query.paginate(page.to_i, User.default_per_page)
-    @users = search.execute!.results
-    @count[:query_result] = @users.total_entries
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @users }
-    end
-  end
-
-  # GET /users/1
-  # GET /users/1.json
-  def show
-    if @user == current_user
-      redirect_to my_account_url
-      return
-    end
-
-    session[:user_return_to] = nil
-    #unless @user.agent
-    #  redirect_to new_user_agent_url(@user); return
-    #end
-    if defined?(EnjuBookmark)
-      @tags = @user.bookmarks.tag_counts.sort{|a,b| a.count <=> b.count}.reverse
-    end
-
-    @manifestation = Manifestation.pickup(@user.keyword_list.to_s.split.sort_by{rand}.first) rescue nil
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @user }
-    end
-  end
-
-  # GET /users/new
-  # GET /users/new.json
-  def new
-    unless current_user.try(:has_role?, 'Librarian')
-      access_denied; return
-    end
-    @user = User.new
-    prepare_options
-    @user_groups = UserGroup.all
-    if @agent.try(:user)
-      flash[:notice] = t('user.already_activated')
-      redirect_to @agent
-      return
-    end
-    @user.agent_id = @agent.id if @agent
-    @user.library = current_user.library
-    @user.locale = current_user.locale
-  end
-
-  # GET /agents/1/edit
-  def edit
-    if @user == current_user
-      redirect_to edit_my_account_url
-      return
-    end
-
-    if defined?(EnjuCirculation)
-      if params[:mode] == 'feed_token'
-        if params[:disable] == 'true'
-          @user.delete_checkout_icalendar_token
-        else
-          @user.reset_checkout_icalendar_token
-        end
-        render :partial => 'users/feed_token'
-        return
-      end
-    end
-    prepare_options
-  end
-
-  # POST /users
-  # POST /users.json
-  def create
-    @user = User.new
-    @user.assign_attributes(params[:user], :as => :admin)
-    @user.operator = current_user
-    @user.set_auto_generated_password
-
-    respond_to do |format|
-      if @user.save
-        role = Role.where(:name => 'User').first
-        user_has_role = UserHasRole.new
-        user_has_role.assign_attributes({:user_id => @user.id, :role_id => role.id}, :as => :admin)
-        user_has_role.save
-        flash[:temporary_password] = @user.password
-        format.html { redirect_to @user, :notice => t('controller.successfully_created', :model => t('activerecord.models.user')) }
-        format.json { render :json => @user, :status => :created, :location => @user }
-      else
-        prepare_options
-        flash[:error] = t('user.could_not_setup_account')
-        format.html { render :action => "new" }
-        format.json { render :json => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /users/1
-  # PUT /users/1.json
-  def update
-    if current_user.has_role?('Librarian')
-      @user.assign_attributes(params[:user], :as => :admin)
-    else
-      @user.assign_attributes(params[:user])
-    end
-    if @user.auto_generated_password == "1"
-      @user.set_auto_generated_password
-      flash[:temporary_password] = @user.password
-    end
-
-    respond_to do |format|
-      @user.save
-      if @user.errors.empty?
-        format.html { redirect_to @user, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user')) }
-        format.json { head :no_content }
-      else
-        prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /users/1
-  # DELETE /users/1.json
-  def destroy
-    if @user.deletable_by(current_user)
-      @user.destroy
-    else
-      flash[:notice] = @user.errors[:base].join(' ')
-      redirect_to current_user
-      return
-    end
-
-    respond_to do |format|
-      format.html { redirect_to(users_url) }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-  def prepare_options
-    @user_groups = UserGroup.all
-    @roles = Role.all
-    @libraries = Library.all_cache
-    @languages = Language.all_cache
-    if @user.active_for_authentication?
-      @user.locked = '0'
-    else
-      @user.locked = '1'
-    end
-  end
-end

data/app/models/user_sweeper.rb

@@ -1,18 +0,0 @@
-class UserSweeper < ActionController::Caching::Sweeper
-  observe User
-
-  def after_save(record)
-    case record.class.to_s.to_sym
-    when :User
-      I18n.available_locales.each do |locale|
-        ['menu'].each do |name|
-          expire_fragment(:controller => :page, :user => record.username, :role => record.role.try(:name), :page => name, :locale => locale)
-        end
-      end
-    end
-  end
-
-  def after_destroy(record)
-    after_save(record)
-  end
-end

data/app/views/users/_edit_credential.html.erb

@@ -1,79 +0,0 @@
-  <div id="left_pane_detail">
-
-  <div class="field">
-    <%= f.label :username -%><br />
-    <%= user.username -%>
-  </div>
-
-  <%- if current_user.has_role?('Librarian') -%>
-    <div class="field">
-      <%= f.label :email -%><br />
-      <%= f.email_field :email, :class => 'resource_email' -%>
-    </div>
-
-    <div class="field">
-      <%= f.label t('user.set_auto_generated_password') -%>
-      <%= f.check_box :auto_generated_password -%>
-    </div>
-  <%- end -%>
-
-  <div class="field">
-    <%= f.label :expired_at -%><br />
-    <%- if current_user.has_role?('Librarian') -%>
-      <%= f.text_field :expired_at, :value => user.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_text_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
-    <%- else -%>
-      <%= l(user.expired_at) if user.expired_at -%>
-    <%- end -%>
-  </div>
-
-  <div class="field">
-    <%= f.check_box :locked -%>
-    <%= f.label :locked -%>
-  </div>
-
-  </div>
-
-  <div id="right_pane_detail">
-  <%- if current_user.has_role?('Librarian') -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.user_group') -%><br />
-      <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
-    </div>
-  <%- end -%>
-
-    <div class="field">
-      <%= f.label t('activerecord.models.role') -%><br />
-      <%= f.fields_for :user_has_role do |u| %>
-        <%- if current_user.has_role?('Administrator') and current_user != user -%>
-          <%= u.select :role_id, @roles.collect{|r| [r.display_name.localize, r.id]} %>
-        <% else %>
-          <%= u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {:disabled => 'disabled'}) -%>
-        <% end %>
-      <% end %>
-    </div>
-
-    <div class="field">
-      <%= f.label :user_number -%><br />
-      <%- if current_user.has_role?('Librarian') -%>
-        <%= f.text_field :user_number, :class => 'resource_user_number' -%>
-      <%- else -%>
-        <%= user.user_number -%>
-      <%- end -%>
-    </div>
-
-  <%- if current_user.has_role?('Librarian') -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.library') -%><br />
-      <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
-    </div>
-
-    <div class="field">
-      <%= f.label t('role.required_role') -%><br />
-      <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
-    </div>
-  <%- end -%>
-  <div class="field">
-    <%= f.label :locale -%><br />
-    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
-  </div>
-  </div>

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

@@ -1,76 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.edit_user_profile', :login_name => @user.username) -%></h1>
-<div id="content_list">
-<%= render 'page/required_field' %>
-<%= simple_form_for(@user, :validate => true) do |f| -%>
-  <%= f.error_messages -%>
-
-  <%= render :partial => 'users/edit_credential', :locals => {:f => f, :user => @user} -%>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<div style="clear: both">
-  <div class="field">
-    <%= f.label :keyword_list -%><br />
-    <%= f.text_area :keyword_list, :class => 'resource_textarea' -%>
-  </div>
-
-  <% if defined?(EnjuCirculation) %>
-    <div class="field">
-      <%= f.label t('user.checkout_history_icalendar_url') -%><br />
-      <div id="feed_token">
-        <%- if @user.checkout_icalendar_token? -%>
-          <%= link_to checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics), checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics) -%>
-          <%= f.hidden_field :checkout_icalendar_token -%>
-        <%- end -%>
-        <br />
-        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, :mode => 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
-        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, :disable => true, :mode => 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
-      </div>
-      <br />
-    </div>
-  <% end %>
-
-  <% if defined?(EnjuSearchLog) %>
-    <div class="field">
-      <%= f.check_box :save_search_history %>
-      <%= f.label :save_search_history %>
-    </div>
-  <% end %>
-
-  <% if defined?(EnjuCirculation) %>
-    <div class="field">
-      <%= f.check_box :save_checkout_history %>
-      <%= f.label :save_checkout_history %>
-    </div>
-  <% end %>
-
-  <% if current_user.has_role?('Librarian') %>
-    <div class="field">
-      <%= f.label :note -%><br />
-      <%= f.text_area :note, :class => 'resource_textarea' -%>
-    </div>
-  <% end %>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-
-</div>
-  <%- end -%>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li><%= link_to t('page.show'), @user -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.user')), users_path -%></li>
-    <%- if current_user.has_role?('Librarian') -%>
-      <%- unless current_user == @user -%>
-        <li><%= link_to t('page.destroy'), @user, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
-      <%- end -%>
-    <%- end -%>
-  </ul>
-</div>

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

@@ -1,56 +0,0 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user')) -%></h1>
-<div id="content_list">
-
-<div class="search_form">
-<%= form_for :users, :url => users_path, :html => {:method => 'get'} do -%>
-  <p>
-    <%= label_tag :query, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), :class => 'search_form', :placeholder => t('page.search_term') -%>
-    <%= submit_tag t('page.search') -%>
-  </p>
-<%- end -%>
-</div>
-
-<table class="table table-striped index">
-  <tr>
-    <th>
-      <%= t('activerecord.attributes.user.username') -%>
-      <%= link_to image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), url_for(params.merge(:sort_by => 'username', :order => 'asc', :only_path => true)) -%>
-      <%= link_to image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), url_for(params.merge(:sort_by => 'username', :order => 'desc', :only_path => true)) -%>
-    </th>
-    <th><%= t('activerecord.attributes.user.user_number') -%></th>
-    <th>
-      <%= t('page.created_at') -%>
-      <%= link_to image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), url_for(params.merge(:sort_by => 'created_at', :order => 'asc', :only_path => true)) -%>
-      <%= link_to image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), url_for(params.merge(:sort_by => 'created_at', :order => 'desc', :only_path => true)) -%>
-    </th>
-    <th></th>
-  </tr>
-
-<%- @users.each_with_index do |user, i| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td>
-      <%= link_to user.username, user -%>
-    </td>
-    <td><%= user.user_number -%></td>
-    <td><%= l(user.created_at) if user.created_at -%></td>
-    <td>
-      <%= link_to t('user.edit_account'), edit_user_path(user) -%>
-    </td>
-  </tr>
-<%- end -%>
-</table>
-
-<br />
-<%= paginate(@users) -%>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <%- if user_signed_in? && current_user.has_role?('Librarian') -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.user')), new_user_path -%></li>
-    <%- end -%>
-  </ul>
-</div>

data/lib/enju_leaf/expire_editable_fragment.rb

@@ -1,30 +0,0 @@
-module ExpireEditableFragment
-  def expire_editable_fragment(record, fragments = [])
-    fragments.uniq!
-    if record.is_a?(Manifestation)
-      if fragments.empty?
-        fragments = %w[manifestation_html show_detail_user_html show_detail_librarian_html pickup_html title_html title_mobile index_sru list_identifiers_oai list_records_oai]
-      end
-      expire_manifestation_cache(record, fragments)
-    else
-      I18n.available_locales.each do |locale|
-        Role.all_cache.each do |role|
-          fragments.each do |fragment|
-            expire_fragment(":#{record.class.to_s.downcase}" => record.id, :fragment => fragment, :role => role.name, :locale => locale)
-          end
-        end
-      end
-    end
-  end
-
-  private
-  def expire_manifestation_cache(manifestation, fragments = [])
-    I18n.available_locales.each do |locale|
-      Role.all_cache.each do |role|
-        fragments.uniq.each do |fragment|
-          expire_fragment(:manifestation => manifestation.id, :fragment => fragment, :role => role.name, :locale => locale)
-        end
-      end
-    end
-  end
-end

data/lib/enju_leaf/expire_fragment_cache.rb

@@ -1,17 +0,0 @@
-class ExpireFragmentCache
-  def self.expire_fragment_cache(record, fragments = [])
-    if record.is_a?(Manifestation)
-      if fragments.empty?
-        fragments = %w[manifestation_html show_detail_user_html show_detail_librarian_html pickup_html title_html title_mobile index_sru]
-      end
-    end
-
-    I18n.available_locales.each do |locale|
-      Role.all_cache.each do |role|
-        fragments.each do |fragment|
-          Rails.cache.delete(":#{record.class.to_s.downcase}" => record.id, :fragment => fragment, :role => role.name, :locale => locale)
-        end
-      end
-    end
-  end
-end