Merge pull request #183 from omu/develop

Merge develop into master
omu · Aug 5, 2018 · 1473f85 · 1473f85
2 parents 6589569 + 178ccc9
commit 1473f85
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/app/controllers/account/identities_controller.rb b/app/controllers/account/identities_controller.rb
@@ -44,7 +44,7 @@ def set_identity
     def set_elapsed_time
       formal_identity = current_user.identities.user_identity
       return if formal_identity.blank?
-      elapsed_time(formal_identity.first)
+      elapsed_time(formal_identity)
     end
 
     def redirect_with(message)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -31,6 +31,7 @@ def create
   def edit; end
 
   def update
+    @user.slug = nil if user_params[:email].present?
     @user.update_without_password(user_params) ? redirect_with('.success') : render(:edit)
   end
 

diff --git a/app/jobs/kps_identity_save_job.rb b/app/jobs/kps_identity_save_job.rb
@@ -10,7 +10,7 @@ def perform(user, student_id = nil)
   end
 
   # callbacks
-  after_perform do |_job|
+  after_perform do |job|
     response = @response.merge(student_id: @student_id)
     formal_address = job.arguments.first.identities.formal
     formal_address.present? ? formal_address.update(response) : formal_address.create(response)

diff --git a/app/services/kps/omu/kimlik.rb b/app/services/kps/omu/kimlik.rb
@@ -12,6 +12,8 @@ def initialize
         def sorgula(queried_id_number)
           make_request(queried_id_number)
 
+          raise IdNumberError if @response[:hata_bilgisi].present?
+
           err_args = %i[kisi_bilgisi hata_bilgisi aciklama]
           id_info_args = %i[kisi_bilgisi temel_bilgisi]
           marital_info_args = %i[kisi_bilgisi durum_bilgisi]

diff --git a/app/views/home/components/_membership_notifications.html.erb b/app/views/home/components/_membership_notifications.html.erb
@@ -12,12 +12,12 @@
       <hr>
       <% unless current_user.addresses.any? %>
         <div class="alert alert-warning" role="alert">
-          <small class="text-muted"><%= link_to t('.address_information'), new_address_path %> <%= t('.seems_missing') %></small>
+          <small class="text-muted"><%= link_to t('.address_information'), addresses_path %> <%= t('.seems_missing') %></small>
         </div>
       <% end %>
       <% unless current_user.identities.any? %>
         <div class="alert alert-warning" role="alert">
-          <small class="text-muted"><%= link_to t('.identity_information'), new_identity_path %> <%= t('.seems_missing') %></small>
+          <small class="text-muted"><%= link_to t('.identity_information'), identities_path %> <%= t('.seems_missing') %></small>
         </div>
       <% end %>
     </div>

diff --git a/app/views/users/_addresses.html.erb b/app/views/users/_addresses.html.erb
@@ -19,9 +19,7 @@
                 <td>
                   <span class="badge badge-secondary">
                     <%= fa_icon('gavel', text: t('activerecord.enums.address.names.formal')) if address.formal? %>
-                    <%= fa_icon('home', text: t('activerecord.enums.address.names.home')) if address.home? %>
-                    <%= fa_icon('building', text: t('activerecord.enums.address.names.work')) if address.work? %>
-                    <%= fa_icon('address-book', text: t('activerecord.enums.address.names.other')) if address.other? %>
+                    <%= fa_icon('address-book', text: t('activerecord.enums.address.names.other')) if address.informal? %>
                   </span>
                 </td>
               </tr>