enju_leaf 1.1.0.rc12 → 1.1.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b107d99c3e78230a6ebcd243c0ace7ecaf5a33
-  data.tar.gz: 74bd9a227173ae8030cfd5bbff4ba8976d8264fc
+  metadata.gz: 30cec87ac36bc5f86229522a16fa000de67d4045
+  data.tar.gz: 1e767244cb0a31287ae1bf0f9a7e100c6495e129
 SHA512:
-  metadata.gz: 8df4aa6780068226018fa4ada0064842dc0b4c128e7f5f96662f35f48e3897b45d1adb7653705e47b74e3d1d643e0e29bcc8b3d5424592d0e29ad2d26b59a64d
-  data.tar.gz: c5df9de9697f689a281d765b4148b0fe52773fe90b3b73aa1ecc82a561e938c2acaf295c7093d642083eaff3db68d7b6e9f972f4d30fd577adab606e064b5240
+  metadata.gz: 7280e3e949c72894314feb4fbd57679cf6c4b6e49641df908c949f060965e41736bff362e0f3c924010bd4b8a8499a424421a8b37809c07560cfbd64eede0e76
+  data.tar.gz: 5d12f151f53a63dc8eb387ebe89b8d403b121e83a247da1dc27f67378dd63a1e9d115658612c91f73201d80bd9dbc8b9ddc3eaf081ab0689b408196c35736c09

data/app/assets/stylesheets/enju.css

@@ -484,7 +484,6 @@ img.icon{
   position: absolute;
   background-color: white;
   padding: 10px;
-  border: 1px solid #5970B2;
   max-width: 250px;
 }
 

data/app/controllers/my_accounts_controller.rb

@@ -2,24 +2,24 @@ class MyAccountsController < ApplicationController
   before_filter :authenticate_user!
 
   def show
-    @user = current_user
+    @profile = current_user.profile
 
     respond_to do |format|
       format.html
-      format.json { render :json => @user }
+      format.json { render json: @profile }
     end
   end
 
   def edit
-    @user = current_user
+    @profile = current_user.profile
     if defined?(EnjuCirculation)
       if params[:mode] == 'feed_token'
         if params[:disable] == 'true'
-          @user.delete_checkout_icalendar_token
+          @profile.delete_checkout_icalendar_token
         else
-          @user.reset_checkout_icalendar_token
+          @profile.reset_checkout_icalendar_token
         end
-        render :partial => 'feed_token'
+        render partial: 'feed_token'
         return
       end
     end
@@ -27,34 +27,42 @@ class MyAccountsController < ApplicationController
   end
 
   def update
-    @user = current_user
+    @profile = current_user.profile
 
     respond_to do |format|
       if current_user.has_role?('Librarian')
-        saved = current_user.update_with_password(params[:user], :as => :admin)
+        saved = current_user.update_with_password(params[:profile][:user_attributes], as: :admin)
+        @profile.assign_attributes(params[:profile], as: :admin)
       else
-        saved = current_user.update_with_password(params[:user])
+        saved = current_user.update_with_password(params[:profile][:user_attributes])
+        @profile.assign_attributes(params[:profile])
       end
 
       if saved
-        sign_in(current_user, :bypass => true)
-        format.html { redirect_to my_account_url, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user')) }
-        format.json { head :no_content }
+        if @profile.save
+          sign_in(current_user, :bypass => true)
+          format.html { redirect_to my_account_url, 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: current_user.errors, status: :unprocessable_entity }
+        end
       else
-        @user = current_user
+        @profile.errors[:base] << I18n.t('activerecord.attributes.user.current_password')
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => current_user.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: current_user.errors, status: :unprocessable_entity }
       end
     end
   end
 
   def destroy
-    @user = current_user
-    @user.destroy
+    @profile = current_user.profile
+    @profile.destroy
 
     respond_to do |format|
-      format.html { redirect_to my_account_url, :notice => 'devise.registrations.destroyed' }
+      format.html { redirect_to my_account_url, notice: 'devise.registrations.destroyed' }
       format.json { head :no_content }
     end
   end

data/app/controllers/page_controller.rb

@@ -1,8 +1,8 @@
 class PageController < ApplicationController
-  before_filter :clear_search_sessions, :only => [:index, :advanced_search]
-  before_filter :store_location, :only => [:advanced_search, :about, :add_on, :msie_acceralator, :statistics]
-  before_filter :authenticate_user!, :except => [:index, :advanced_search, :about, :add_on, :msie_acceralator, :opensearch, :statistics, :routing_error]
-  before_filter :check_librarian, :except => [:index, :advanced_search, :about, :add_on, :msie_acceralator, :opensearch, :statistics, :routing_error]
+  before_filter :clear_search_sessions, only: [:index, :advanced_search]
+  before_filter :store_location, only: [:advanced_search, :about, :add_on, :msie_acceralator, :statistics]
+  before_filter :authenticate_user!, except: [:index, :advanced_search, :about, :add_on, :msie_acceralator, :opensearch, :statistics, :routing_error]
+  before_filter :check_librarian, except: [:index, :advanced_search, :about, :add_on, :msie_acceralator, :opensearch, :statistics, :routing_error]
   helper_method :get_libraries
 
   def index
@@ -32,11 +32,11 @@ class PageController < ApplicationController
   end
 
   def msie_acceralator
-    render :layout => false
+    render layout: false
   end
 
   def opensearch
-    render :layout => false
+    render layout: false
   end
 
   def advanced_search

data/app/controllers/profiles_controller.rb

@@ -0,0 +1,155 @@
+# -*- encoding: utf-8 -*-
+class ProfilesController < ApplicationController
+  load_and_authorize_resource except: [:index, :create]
+  authorize_resource only: [:index, :create]
+  before_filter :prepare_options, only: [:new, :edit]
+
+  # GET /profiles
+  # GET /profiles.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 = Profile.search
+    search.build do
+      fulltext query if query
+      order_by sort[:sort_by], sort[:order]
+    end
+    search.query.paginate(page.to_i, Profile.default_per_page)
+    @profiles = search.execute!.results
+    @count[:query_result] = @profiles.total_entries
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @profiles }
+    end
+  end
+
+  # GET /profiles/1
+  # GET /profiles/1.json
+  def show
+    if @profile.user == current_user
+      redirect_to my_account_url
+      return
+    end
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @profile }
+    end
+  end
+
+  # GET /profiles/new
+  def new
+    @profile = Profile.new
+    @profile.user = User.new
+    @profile.user_group = current_user.profile.user_group
+    @profile.library = current_user.profile.library
+    @profile.locale = current_user.profile.locale
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @profile }
+    end
+  end
+
+  # GET /profiles/1/edit
+  def edit
+    if @profile.user == current_user
+      redirect_to edit_my_account_url
+      return
+    end
+  end
+
+  # POST /profiles
+  # POST /profiles.json
+  def create
+    if current_user.has_role?('Librarian')
+      @profile = Profile.new(params[:profile], as: :admin)
+      if @profile.user
+        @profile.user.operator = current_user
+        @profile.user.set_auto_generated_password
+      end
+    else
+      @profile = Profile.new(params[:profile])
+    end
+
+    respond_to do |format|
+      if @profile.save
+        if @profile.user
+          @profile.user.role = Role.where(name: 'User').first
+          flash[:temporary_password] = @profile.user.password
+        end
+        format.html { redirect_to @profile, notice: t('controller.successfully_created', model: t('activerecord.models.profile')) }
+        format.json { render json: @profile, status: :created, location: @profile }
+      else
+        prepare_options
+        format.html { render action: "new" }
+        format.json { render json: @profile.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /profiles/1
+  # PUT /profiles/1.json
+  def update
+    if current_user.has_role?('Librarian')
+      @profile.update_attributes(params[:profile], as: :admin)
+    else
+      @profile.update_attributes(params[:profile])
+    end
+    if @profile.user
+      if @profile.user.auto_generated_password == "1"
+        @profile.user.set_auto_generated_password
+        flash[:temporary_password] = @profile.user.password
+      end
+    end
+
+    respond_to do |format|
+      if @profile.save
+        format.html { redirect_to @profile, notice: t('controller.successfully_updated', model: t('activerecord.models.profile')) }
+        format.json { head :no_content }
+      else
+        prepare_options
+        format.html { render action: "edit" }
+        format.json { render json: @profile.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /profiles/1
+  # DELETE /profiles/1.json
+  def destroy
+    @profile.destroy
+
+    respond_to do |format|
+      format.html { redirect_to profiles_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.profile')) }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+  def prepare_options
+    @user_groups = UserGroup.all
+    @roles = Role.all
+    @libraries = Library.all
+    @languages = Language.all
+  end
+end

data/app/controllers/roles_controller.rb

@@ -6,7 +6,7 @@ class RolesController < ApplicationController
   def index
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @roles }
+      format.json { render json: @roles }
     end
   end
 
@@ -15,7 +15,7 @@ class RolesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @role }
+      format.json { render json: @role }
     end
   end
 
@@ -33,11 +33,11 @@ class RolesController < ApplicationController
 
     respond_to do |format|
       if @role.update_attributes(params[:role])
-        format.html { redirect_to @role, :notice => t('controller.successfully_updated', :model => t('activerecord.models.role')) }
+        format.html { redirect_to @role, notice: t('controller.successfully_updated', model: t('activerecord.models.role')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @role.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @role.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/user_export_files_controller.rb

@@ -0,0 +1,100 @@
+class UserExportFilesController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /user_export_files
+  # GET /user_export_files.json
+  def index
+    @user_export_files = UserExportFile.order('id DESC').page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @user_export_files }
+    end
+  end
+
+  # GET /user_export_files/1
+  # GET /user_export_files/1.json
+  def show
+    if @user_export_file.user_export.path
+      unless Setting.uploaded_file.storage == :s3
+        file = @user_export_file.user_export.path
+      end
+    end
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @user_export_file }
+      format.download {
+        if Setting.uploaded_file.storage == :s3
+          redirect_to @user_export_file.user_export.expiring_url(10)
+        else
+          send_file file, filename: @user_export_file.user_export_file_name, type: 'application/octet-stream'
+        end
+      }
+    end
+  end
+
+  # GET /user_export_files/new
+  # GET /user_export_files/new.json
+  def new
+    @user_export_file = UserExportFile.new
+    @user_export_file.user = current_user
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @user_export_file }
+    end
+  end
+
+  # GET /user_export_files/1/edit
+  def edit
+  end
+
+  # POST /user_export_files
+  # POST /user_export_files.json
+  def create
+    @user_export_file = UserExportFile.new(params[:user_export_file])
+    @user_export_file.user = current_user
+
+    respond_to do |format|
+      if @user_export_file.save
+        if @user_export_file.mode == 'export'
+          Resque.enqueue(UserExportFileQueue, @user_export_file.id)
+        end
+        format.html { redirect_to @user_export_file, notice: t('export.successfully_created', model: t('activerecord.models.user_export_file')) }
+        format.json { render json: @user_export_file, status: :created, location: @user_export_file }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @user_export_file.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /user_export_files/1
+  # PUT /user_export_files/1.json
+  def update
+    respond_to do |format|
+      if @user_export_file.update_attributes(params[:user_export_file])
+        if @user_export_file.mode == 'export'
+          UserExportFileQueue.perform(@user_export_file.id)
+        end
+        format.html { redirect_to @user_export_file, notice: t('controller.successfully_updated', model: t('activerecord.models.user_export_file')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @user_export_file.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /user_export_files/1
+  # DELETE /user_export_files/1.json
+  def destroy
+    @user_export_file.destroy
+
+    respond_to do |format|
+      format.html { redirect_to user_export_files_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/user_groups_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class UserGroupsController < ApplicationController
   load_and_authorize_resource
-  before_filter :prepare_options, :only => [:new, :edit]
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /user_groups
   # GET /user_groups.json
@@ -10,7 +10,7 @@ class UserGroupsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @user_groups }
+      format.json { render json: @user_groups }
     end
   end
 
@@ -19,7 +19,7 @@ class UserGroupsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @user_group }
+      format.json { render json: @user_group }
     end
   end
 
@@ -29,7 +29,7 @@ class UserGroupsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @user_group }
+      format.json { render json: @user_group }
     end
   end
 
@@ -44,12 +44,12 @@ class UserGroupsController < ApplicationController
 
     respond_to do |format|
       if @user_group.save
-        format.html { redirect_to @user_group, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_group')) }
-        format.json { render :json => @user_group, :status => :created, :location => @user_group }
+        format.html { redirect_to @user_group, notice: t('controller.successfully_created', model: t('activerecord.models.user_group')) }
+        format.json { render json: @user_group, status: :created, location: @user_group }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @user_group.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @user_group.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -64,12 +64,12 @@ class UserGroupsController < ApplicationController
 
     respond_to do |format|
       if @user_group.update_attributes(params[:user_group])
-        format.html { redirect_to @user_group, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_group')) }
+        format.html { redirect_to @user_group, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @user_group.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @user_group.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/user_import_files_controller.rb

@@ -1,5 +1,6 @@
 class UserImportFilesController < ApplicationController
   load_and_authorize_resource
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /user_import_files
   # GET /user_import_files.json
@@ -8,7 +9,7 @@ class UserImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @user_import_files }
+      format.json { render json: @user_import_files }
     end
   end
 
@@ -23,12 +24,12 @@ class UserImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @user_import_file }
+      format.json { render json: @user_import_file }
       format.download {
         if Setting.uploaded_file.storage == :s3
           redirect_to @user_import_file.user_import.expiring_url(10)
         else
-          send_file file, :filename => @user_import_file.user_import_file_name, :type => 'application/octet-stream'
+          send_file file, filename: @user_import_file.user_import_file_name, type: 'application/octet-stream'
         end
       }
     end
@@ -38,10 +39,12 @@ class UserImportFilesController < ApplicationController
   # GET /user_import_files/new.json
   def new
     @user_import_file = UserImportFile.new
+    @user_import_file.default_user_group = current_user.profile.user_group
+    @user_import_file.default_library = current_user.profile.library
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @user_import_file }
+      format.json { render json: @user_import_file }
     end
   end
 
@@ -60,11 +63,12 @@ class UserImportFilesController < ApplicationController
         if @user_import_file.mode == 'import'
           Resque.enqueue(UserImportFileQueue, @user_import_file.id)
         end
-        format.html { redirect_to @user_import_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_import_file')) }
-        format.json { render :json => @user_import_file, :status => :created, :location => @user_import_file }
+        format.html { redirect_to @user_import_file, notice: t('import.successfully_created', model: t('activerecord.models.user_import_file')) }
+        format.json { render json: @user_import_file, status: :created, location: @user_import_file }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @user_import_file.errors, :status => :unprocessable_entity }
+        prepare_options
+        format.html { render action: "new" }
+        format.json { render json: @user_import_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -77,11 +81,12 @@ class UserImportFilesController < ApplicationController
         if @user_import_file.mode == 'import'
           Resque.enqueue(UserImportFileQueue, @user_import_file.id)
         end
-        format.html { redirect_to @user_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_import_file')) }
+        format.html { redirect_to @user_import_file, notice: t('controller.successfully_updated', model: t('activerecord.models.user_import_file')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @user_import_file.errors, :status => :unprocessable_entity }
+        prepare_options
+        format.html { render action: "edit" }
+        format.json { render json: @user_import_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -96,4 +101,10 @@ class UserImportFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def prepare_options
+    @user_groups = UserGroup.all
+    @libraries = Library.all
+  end
 end

data/app/controllers/user_import_results_controller.rb

@@ -1,5 +1,5 @@
 class UserImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :tsv
+  respond_to :html, :json, :txt
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy

data/app/mailers/notifier.rb

@@ -3,28 +3,28 @@ class Notifier < ActionMailer::Base
 
   def message_notification(message_id)
     message = Message.find(message_id)
-    I18n.locale = message.receiver.locale.try(:to_sym) || I18n.default_locale
-    from = "#{LibraryGroup.system_name(message.receiver.locale)} <#{LibraryGroup.site_config.email}>"
+    I18n.locale = message.receiver.profile.locale.try(:to_sym) || I18n.default_locale
+    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
     if message.subject
       subject = message.subject
     else
-      subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.locale))
+      subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.profile.locale))
     end
     if message.sender
       @sender_name = message.sender.username
     else
-      @sender_name = LibraryGroup.system_name(message.receiver.locale)
+      @sender_name = LibraryGroup.system_name(message.receiver.profile.locale)
     end
     @message = message
-    @locale = message.receiver.locale
+    @locale = message.receiver.profile.locale
     mail(:from => from, :to => message.receiver.email, :subject => subject)
   end
 
   def manifestation_info(user_id, manifestation_id)
     user = User.find(user_id)
     manifestation = Manifestation.find(manifestation_id)
-    from = "#{LibraryGroup.system_name(user.locale)} <#{LibraryGroup.site_config.email}>"
-    subject = "#{manifestation.original_title} : #{LibraryGroup.system_name(user.locale)}"
+    from = "#{LibraryGroup.system_name(user.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
+    subject = "#{manifestation.original_title} : #{LibraryGroup.system_name(user.profile.locale)}"
     @user = user
     @manifestation = manifestation
     mail(:from => from, :to => user.email, :subject => subject)