mumuki-laboratory 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f37222cfbd2062f66b0734673a6d1703db85abf107e8d9a1bcdce89e00d007
-  data.tar.gz: 7ecb6822446436ea233a5a3491464bd87fa66ad8150ba6896ebd4ff50dac78a9
+  metadata.gz: b5f61c0972720fad49773ce961e0d22bf5ccbe278227acf8c774b96c2496c700
+  data.tar.gz: 6a0f37e73b932e93103875147c87a26655db669ca3bc8596b07e7c7f088f9de0
 SHA512:
-  metadata.gz: 2c806d54fec0d78d19de80c35b4402819e8c8364ab22e8e38fb717ac013ef73d0f076b7ad35b47f691009a6bfc3d1c51049994beafb1cb18b5d96f189c2cf352
-  data.tar.gz: bb6d056380dbae62c810f5ceca81b1ef22ecb383132d2454edc385985271f4b2f85ad3564141560e0c48391d820956c9de233f4ea4eb94dae9b9ac9ba8f96876
+  metadata.gz: 41e106589d3de950b94ccdc08c61c391426a24d0221ade64ad360bf05f475f40105aa669ecc79e01f4af988103e393efe7ed0515800d24b62def8df4dd193dee
+  data.tar.gz: 06fac5ebb2ee4bf166b9fd05d137d79ad8b2d9c00178b43fbef3496f697ef025c778dbebe380c12af3ffe3485617871d89069d274c059ae598afdcb9ca811ab8

data/app/assets/javascripts/application/kids.js

@@ -198,6 +198,7 @@ mumuki.load(function () {
           results_kids_modal.find('.modal-header').first().html(data.title_html);
           results_kids_modal.find('.modal-footer').first().html(data.button_html);
           mumuki.kids._showCorollaryCharacter();
+          $('.mu-close-modal').click(() => $('#kids-results').modal('hide'));
         }
       }, 1000 * 4);
     },

data/app/controllers/concerns/organizations_controller_template.rb

@@ -14,7 +14,7 @@ module OrganizationsControllerTemplate
   end
 
   def set_organization!
-    @organization = Organization.find_by! name: params[:id]
+    @organization = Organization.locate! params[:id]
   end
 
   def protection_slug

data/app/controllers/concerns/users_controller_template.rb

@@ -18,7 +18,7 @@ module UsersControllerTemplate
   end
 
   def set_user!
-    @user = User.find_by uid: params[:id]
+    @user = User.locate! params[:id]
   end
 
   def set_new_user!

data/app/helpers/concerns/with_student_path_navigation.rb

@@ -12,4 +12,8 @@ module WithStudentPathNavigation
   def next_exercise_button(exercise)
     next_button(exercise) || next_button(exercise.guide.lesson)
   end
+
+  def close_modal_button
+    %Q{<button class="btn btn-success btn-block mu-close-modal">#{t :keep_learning}</button>}.html_safe
+  end
 end

data/app/views/exercise_solutions/_kids_results_button.html.erb

@@ -2,7 +2,7 @@
   <div class="col-md-12">
     <div class="actions">
       <% if assignment.passed? %>
-        <%= next_exercise_button(@exercise) %>
+        <%= next_exercise_button(@exercise) || close_modal_button %>
       <% else %>
         <button class="btn btn-success btn-block submission-control" id="kids-btn-retry" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
       <% end %>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '6.4.0'
+    VERSION = '6.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails