enju_seed 0.3.0.beta.3 → 0.3.0.beta.4

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

@@ -0,0 +1,70 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.profile')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<div class="search_form">
+<%= form_for :profiles, url: profiles_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.profile.user_number') -%></th>
+    <th><%= t('activerecord.attributes.user.username') -%>
+      <%= link_to image_tag('icons/arrow_up.png', size: '16x16', class: 'enju_icon', alt: t('page.asc')), url_for(params.permit.merge(sort_by: 'username', order: 'asc', only_path: true)) -%>
+      <%= link_to image_tag('icons/arrow_down.png', size: '16x16', class: 'enju_icon', alt: t('page.desc')), url_for(params.permit.merge(sort_by: 'username', order: 'desc', only_path: true)) -%>
+    </th>
+    <th>
+      <%= t('page.created_at') -%>
+      <%= link_to image_tag('icons/arrow_up.png', size: '16x16', class: 'enju_icon', alt: t('page.asc')), url_for(params.permit.merge(sort_by: 'created_at', order: 'asc', only_path: true)) -%>
+      <%= link_to image_tag('icons/arrow_down.png', size: '16x16', class: 'enju_icon', alt: t('page.desc')), url_for(params.permit.merge(sort_by: 'created_at', order: 'desc', only_path: true)) -%>
+    </th>
+    <th style="width: 80px"></th>
+  </tr>
+
+<%- @profiles.each_with_index do |profile, i| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td>
+      <% if profile.user_number? %>
+        <%= link_to profile.user_number, profile -%>
+      <% else %>
+        <%= link_to t('profile.no_number'), profile -%>
+      <% end %>
+    </td>
+    <td>
+      <%= profile.user.try(:username) -%>
+      <br />
+      <%= profile.full_name %>
+    </td>
+    <td><%= l(profile.created_at) -%></td>
+    <td>
+      <%= link_to t('page.show'), profile -%>
+      <%= link_to t('page.edit'), edit_profile_path(profile) if policy(profile).update? -%>
+    </td>
+  </tr>
+<%- end -%>
+</table>
+
+<br />
+<%= paginate(@profiles) -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <%- if current_user.try(:has_role?, 'Librarian') -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.user_import_file')), user_import_files_path -%></li>
+      <%- if current_user.has_role?('Administrator') -%>
+        <li><%= link_to t('activerecord.models.user_export_file'), user_export_files_path -%></li>
+      <%- end -%>
+    <%- end -%>
+  </ul>
+</div>

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

@@ -0,0 +1,88 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.profile')) -%></h1>
+<div id="content_list">
+<%= render 'page/required_field' %>
+<%= simple_form_for(@profile, validate: true) do |f| -%>
+  <%= f.error_messages -%>
+
+  <%= f.fields_for :user do |user_form| %>
+    <div class="field">
+      <%= user_form.label :username -%>
+      <%= user_form.text_field :username, class: 'resource_user' -%>
+    </div>
+
+    <div class="field">
+      <%= user_form.label :email -%>
+      <%= user_form.email_field :email, class: 'resource_email' -%>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :expired_at -%>
+    <%= f.text_field :expired_at, class: 'date_text_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
+  </div>
+
+  <div class="field">
+    <%= f.label :full_name -%><br />
+    <%= f.text_field :full_name -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :full_name_transcription -%><br />
+    <%= f.text_field :full_name_transcription -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :user_group_id -%>
+    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
+  </div>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.library') -%>
+    <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :locale -%>
+    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
+  </div>
+
+  <% if defined?(EnjuSearchLog) %>
+    <div class="field">
+      <%= f.label :save_search_history %>
+      <%= f.check_box :save_search_history %>
+    </div>
+  <% end %>
+
+  <% if defined?(EnjuCirculation) %>
+    <div class="field">
+      <%= f.label :save_checkout_history %>
+      <%= f.check_box :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="field">
+    <%= f.label :user_number -%>
+    <%= f.text_field :user_number, class: 'resource_user' -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit t('user.sign_up') -%>
+  </div>
+<%- end -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.profile')), profiles_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
+  </ul>
+</div>

data/app/views/profiles/show.html+phone.erb

@@ -0,0 +1 @@
+<%= render 'page/index' %>

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

@@ -0,0 +1,67 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+  <h2 class="resource_title">
+    [U]
+    <%= @profile.user.username -%>
+    <% if @profile.full_name? %>
+      (<%= @profile.full_name %>)
+    <% end %>
+  </h2>
+
+  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= @profile.user_number %></p>
+  <%- if flash[:temporary_password] -%>
+    <p><%= t('user.your_temporary_password_is') -%>: </p>
+    <p style="font-size: 200%"><%= flash[:temporary_password] -%></p>
+  <%- end -%>
+
+  <% if defined?(EnjuCirculation) %>
+    <%= render 'checkout_list', profile: @profile %>
+  <% end %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <% if defined?(EnjuCirculation) %>
+    <%= render 'submenu_checkout', profile: @profile %>
+  <% end %>
+  <ul>
+    <li><%= link_to t('page.back'), :back %></li>
+    <% if user_signed_in? %>
+      <% if policy(@profile).update? %>
+        <li><%= link_to t('page.edit'), edit_profile_path(@profile) -%></li>
+      <% end %>
+      <% if defined?(EnjuCirculation) %>
+        <% if policy(Checkout).create? and @profile.user_number %>
+          <li><%= link_to t('page.new', model: t('activerecord.models.checkout')), new_basket_path(user_number: @profile.user_number) -%></li>
+        <% end %>
+      <% end %>
+      <% if defined?(EnjuMessage) %>
+        <% if policy(Message).create? %>
+          <li><%= link_to t('message.send'), new_message_path(recipient: @profile.user.username) -%></li>
+        <% end %>
+      <% end %>
+      <%- if policy(Profile).create? -%>
+        <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
+      <% end %>
+      <%- if policy(@profile).destroy? -%>
+        <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+      <% end %>
+    <%- end -%>
+    <% if defined?(EnjuCirculation) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.checkout')), checkouts_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path(user_id: @profile.user.username) %></li>
+    <% end %>
+    <% if defined?(EnjuQuestion) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.question')), questions_path(user_id: @profile.user.username) %></li>
+    <% end %>
+    <% if defined?(EnjuBookmark) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path(user_id: @profile.user.username) %></li>
+    <% end %>
+    <% if defined?(EnjuPurchaseRequest) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.purchase_request')), purchase_requests_path(user_id: @profile.user.username) %></li>
+    <% end %>
+  </ul>
+</div>

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

@@ -0,0 +1,19 @@
+<%= form_for(@role) do |f| %>
+  <%= f.error_messages %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :display_name %><br />
+    <%= f.text_area :display_name %>
+  </div>
+  <div class="field">
+    <%= f.label :note %><br />
+    <%= f.text_area :note %>
+  </div>
+  <div class="actions">
+    <%= f.submit data: {confirm: t('page.are_you_sure')} %>
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.role')) -%></h1>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.show'), role_path(@role) -%></li>
+    <li><%= link_to t('page.back'), roles_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,32 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.role')) -%></h1>
+<div id="content_list">
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.role.name') -%></th>
+    <th><%= t('activerecord.attributes.role.display_name') -%></th>
+    <th></th>
+  </tr>
+
+<%- @roles.each do |role| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to role.name, role -%></td>
+    <td><%= link_to role.display_name.localize, role -%></td>
+    <td>
+      <%- if policy(role).update? -%>
+        <%= link_to t('page.edit'), edit_role_path(role) -%>
+      <%- end -%>
+      <%- if policy(role).destroy? -%>
+        <%= link_to t('page.destroy'), role, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+      <%- end -%>
+    </td>
+  </tr>
+<%- end -%>
+</table>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+</div>

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

@@ -0,0 +1,12 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.role')) -%></h1>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.back'), roles_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,46 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.role')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.attributes.role.name') -%>:</strong>
+  <%= @role.name -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.role.display_name') -%>:</strong>
+  <%= @role.display_name.localize -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.role.score') -%>:</strong>
+  <%= @role.score -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.role.note') -%>:</strong>
+  <%= @role.note -%>
+</p>
+
+<p>
+<strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@role.created_at) if @role.created_at -%>
+</p>
+
+<p>
+<strong><%= t('page.updated_at') -%>:</strong>
+  <%= l(@role.updated_at) if @role.created_at -%>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <%- if policy(@role).update? -%>
+      <li><%= link_to t('page.edit'), edit_role_path(@role) -%></li>
+    <%- end -%>
+    <li><%= link_to t('page.back'), roles_path -%></li>
+  </ul>
+</div>

data/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -1,4 +1,4 @@
-class AddAdditionalAttributesToUser < ActiveRecord::Migration
+class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.0]
   def change
     add_column :users, :username, :string
     add_column :users, :deleted_at, :datetime

data/lib/enju_seed/version.rb

@@ -1,3 +1,3 @@
 module EnjuSeed
-  VERSION = '0.3.0.beta.3'.freeze
+  VERSION = '0.3.0.beta.4'.freeze
 end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -188,7 +188,9 @@ describe MyAccountsController do
       describe 'with invalid params' do
         it 'assigns the requested user as @user' do
           put :update, params: { profile: @invalid_attrs }
-          expect(response).to be_success
+          #expect(response).to be_success
+          expect(assigns(:profile).user.username).to eq(@user.username)
+          expect(response).to redirect_to(my_account_url)
         end
       end
     end

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include EnjuLibrary::Controller

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration[5.0]
   def change
     create_table :agents do |t|
       t.string :last_name

data/spec/dummy/db/migrate/002_devise_create_users.rb

@@ -1,4 +1,4 @@
-class DeviseCreateUsers < ActiveRecord::Migration
+class DeviseCreateUsers < ActiveRecord::Migration[5.0]
   def change
     create_table(:users) do |t|
       ## Database authenticatable

data/spec/dummy/db/migrate/032_create_checkins.rb

@@ -1,4 +1,4 @@
-class CreateCheckins < ActiveRecord::Migration
+class CreateCheckins < ActiveRecord::Migration[5.0]
   def self.up
     create_table :checkins do |t|
       t.integer :item_id, null: false

data/spec/dummy/db/migrate/033_create_checkouts.rb

@@ -1,4 +1,4 @@
-class CreateCheckouts < ActiveRecord::Migration
+class CreateCheckouts < ActiveRecord::Migration[5.0]
   def self.up
     create_table :checkouts do |t|
       t.integer :user_id

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -1,4 +1,4 @@
-class CreateReserves < ActiveRecord::Migration
+class CreateReserves < ActiveRecord::Migration[5.0]
   def self.up
     create_table :reserves do |t|
       t.integer :user_id, null: false

data/spec/dummy/db/migrate/121_create_checked_items.rb

@@ -1,4 +1,4 @@
-class CreateCheckedItems < ActiveRecord::Migration
+class CreateCheckedItems < ActiveRecord::Migration[5.0]
   def self.up
     create_table :checked_items do |t|
       t.integer :item_id, null: false

data/spec/dummy/db/migrate/125_create_donates.rb

@@ -1,4 +1,4 @@
-class CreateDonates < ActiveRecord::Migration
+class CreateDonates < ActiveRecord::Migration[5.0]
   def change
     create_table :donates do |t|
       t.integer :agent_id, :null => false

data/spec/dummy/db/migrate/127_create_use_restrictions.rb

@@ -1,4 +1,4 @@
-class CreateUseRestrictions < ActiveRecord::Migration
+class CreateUseRestrictions < ActiveRecord::Migration[5.0]
   def self.up
     create_table :use_restrictions do |t|
       t.string :name, null: false