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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba893a5163fd2bb7eb4b681a7265c7fba70b8e3
-  data.tar.gz: c3b528b1fd10d49fed41d74fcd7224abe454b449
+  metadata.gz: 835e4e50f50c22127c0c9694c74ee201f394efaf
+  data.tar.gz: bed2b445b0888f024efa12157fbc2846f54c24e5
 SHA512:
-  metadata.gz: c487ad5770413b2821716618cad27f5a24039ab7b798de925533cdb89695a456590a1573cbb9b3ada21a282d8e50d76391185e325724bc31244a36d3079c011a
-  data.tar.gz: ffa66d57221c9a9238a5b62128837ede6fe453581c67dcf6d57064e0d6bf876d37abc183e85171d586e4ea1e87cdbef79c71fc86566b7ed5561cd0372a7c09b3
+  metadata.gz: 5b63fd1654b6eacdc3d3c3671fdd3034ad1a0008e746d3bff7c88b59f7c5b9d604627cbc856644abf4168ca15a3b96049d49f27f9c609260eced2af7290bc7fe
+  data.tar.gz: 96b40dcef213184a2d796af14f9d1d2497394c3ecbb6824230a0a31c76025c7df7fc323feb73fd3df7468c38f0f8acdce64144b6349b995e0913d540bcc8d389

data/app/controllers/my_accounts_controller.rb

@@ -15,35 +15,14 @@ class MyAccountsController < ApplicationController
   end
 
   def update
-    user_attrs = [
-      :id, :email, :current_password, :password, :password_confirmation
-    ]
-    if current_user.has_role?('Administrator')
-      user_attrs += [
-        { user_has_role_attributes: [:id, :role_id] }
-      ]
-    end
-
-    user_params = ActionController::Parameters.new(params[:profile][:user_attributes]).permit(*user_attrs)
-
     respond_to do |format|
-      saved = current_user.update_attributes(user_params)
-      @profile.assign_attributes(profile_params)
+      @profile.assign_attributes(profile_update_params)
 
-      if saved
-        if @profile.save
-          bypass_sign_in(current_user)
-          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
+      if @profile.save
+        bypass_sign_in(current_user)
+        format.html { redirect_to my_account_url, notice: t('controller.successfully_updated', model: t('activerecord.models.user')) }
+        format.json { head :no_content }
       else
-        current_user.errors.full_messages.each do |msg|
-          @profile.errors[:base] << msg
-        end
         prepare_options
         format.html { render action: 'edit' }
         format.json { render json: current_user.errors, status: :unprocessable_entity }
@@ -69,17 +48,43 @@ class MyAccountsController < ApplicationController
 
   def profile_params
     attrs = [
-      :full_name, :full_name_transcription, :user_number,
+      :full_name, :full_name_transcription,
       :library_id, :keyword_list, :note,
-      :locale, :required_role_id, :expired_at,
+      :locale, :required_role_id,
       :locked, :birth_date,
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
-      :save_search_history # EnjuSearchLog
+      :save_search_history, { # EnjuSearchLog
+        user_attributes: [
+          :id, :username, :email, :locked,
+          { user_has_role_attributes: [:id, :role_id] }
+        ]
+      }
     ]
     attrs << :user_group_id if current_user.has_role?('Librarian')
     params.require(:profile).permit(*attrs)
   end
 
+  def profile_update_params
+    attrs = [
+      :full_name, :full_name_transcription,
+      :keyword_list, :locale,
+      :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
+      :save_search_history, # EnjuSearchLog
+    ]
+    if current_user.has_role?('Librarian')
+      attrs += [
+        :library_id, :expired_at, :birth_date,
+        :user_group_id, :required_role_id, :note, :user_number, {
+          user_attributes: [
+            :id, :email, :locked,
+            { user_has_role_attributes: [:id, :role_id] }
+          ]
+        }
+      ]
+    end
+    params.require(:profile).permit(*attrs)
+  end
+
   def prepare_options
     @user_groups = UserGroup.order(:position)
     @roles = Role.order(:position)

data/app/models/concerns/enju_seed/enju_user.rb

@@ -13,9 +13,6 @@ module EnjuSeed
       has_one :user_has_role, dependent: :destroy
       has_one :role, through: :user_has_role
       belongs_to :profile
-      belongs_to :user_group
-      belongs_to :library
-      belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
       accepts_nested_attributes_for :user_has_role
 
       validates :username, presence: true, uniqueness: true, format: {

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

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

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

@@ -0,0 +1,24 @@
+<%= form_for(@user) do |f| %>
+  <% if @user.errors.any? %>
+  <div id="errorExplanation">
+    <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+    <ul>
+    <% @user.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :username %><br />
+    <%= f.text_field :username %>
+  </div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/my_accounts/_show.html.erb

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

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

@@ -0,0 +1,32 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.edit_user_profile', login_name: @profile.user.username) -%></h1>
+<div id="content_list">
+<%= render 'page/required_field' %>
+<%= simple_form_for(@profile, url: my_account_path) do |f| -%>
+  <%= f.error_messages -%>
+
+  <%= render partial: 'edit_credential', locals: {f: f, profile: @profile} -%>
+
+  <div class="actions" style="clear: both">
+    <%= f.submit %>
+  </div>
+  <div class="field">
+    <%= f.label :keyword_list -%><br />
+    <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
+  </div>
+
+  <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
+<%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.show'), my_account_path -%></li>
+    <% if current_user.has_role?('Librarian') %>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.user')), profiles_path -%></li>
+    <% end %>
+    <li><%= link_to t('activerecord.models.registration'), edit_user_registration_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,49 @@
+<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]
+    <%= current_user.username -%>
+  </h2>
+
+  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= @profile.user_number %></p>
+  <% if defined?(EnjuOrcid) %>
+    <p><%= 'ORCID iD' %>: <%= link_to orcid_url(@profile), orcid_url(@profile) %></p>
+  <% end %>
+
+  <% if defined?(EnjuCirculation) %>
+    <%= render 'profiles/checkout_list', profile: @profile %>
+  <% end %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <% if defined?(EnjuCirculation) %>
+    <%= render 'profiles/submenu_checkout', profile: @profile %>
+  <% end %>
+  <ul>
+    <li><%= link_to t('page.edit'), edit_my_account_path -%></li>
+    <li><%= link_to t('activerecord.models.registration'), edit_user_registration_path -%></li>
+    <%- if policy(@profile).destroy? -%>
+      <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+    <%- end -%>
+    <% if defined?(EnjuSearchLog) %>
+      <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
+    <% 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/profiles/_edit_credential.html.erb

@@ -34,9 +34,9 @@
       <%= user_form.label t('activerecord.models.role') -%><br />
       <%= user_form.fields_for :user_has_role do |u| %>
         <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
-          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]} %>
+          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]} %>
         <% else %>
-          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]}, {}, {disabled: 'disabled'} %>
+          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled'} %>
         <% end %>
       <% end %>
     </div>
@@ -56,7 +56,7 @@
     <%- 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, u.id]}) -%>
+        <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
       </div>
     <%- end -%>
 
@@ -72,17 +72,17 @@
     <%- 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, l.id]}) -%>
+        <%= 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, r.id]}) -%>
+        <%= 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, language.iso_639_1]}) -%>
+      <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
     </div>
   </div>
 <% end %>

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

@@ -0,0 +1,42 @@
+  <% if defined?(EnjuCirculation) %>
+    <div class="field">
+      <%= f.label t('user.checkout_history_icalendar_url') -%><br />
+      <div id="feed_token">
+        <%- if profile.checkout_icalendar_token? -%>
+          <%= link_to checkouts_url(icalendar_token: profile.checkout_icalendar_token, format: :ics), checkouts_url(icalendar_token: profile.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_profile_path(profile, 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_profile_path(profile, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
+      </div>
+      <br />
+    </div>
+  <% end %>
+
+  <% 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="actions">
+    <%= f.submit %>
+  </div>
+
+

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

@@ -0,0 +1,15 @@
+<%= form_for(@user) do |f| %>
+  <%= f.error_notification -%>
+
+  <div class="field">
+    <%= f.label :username %><br />
+    <%= f.text_field :username %>
+  </div>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

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

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

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

@@ -0,0 +1,33 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.edit_user_profile', login_name: @profile.user.username) -%></h1>
+<div id="content_list">
+<%= render 'page/required_field' %>
+<%= simple_form_for(@profile, validate: true) do |f| -%>
+  <%= f.error_messages -%>
+
+  <%= render partial: 'profiles/edit_credential', locals: {f: f, profile: @profile} -%>
+
+  <div class="actions" style="clear: both">
+    <%= f.submit %>
+  </div>
+
+  <div class="field">
+    <%= f.label :keyword_list -%><br />
+    <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
+  </div>
+
+  <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
+<%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.show'), @profile -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.profile')), profiles_path -%></li>
+    <%- if policy(@profile).destroy? -%>
+      <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+    <%- end -%>
+  </ul>
+</div>