mumuki-laboratory 5.6.2 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf1e7ba469d8ee20ad2a43ef9f59b83d746c43d0a9ce388a7a5c4c6c0c1dbf6
-  data.tar.gz: 976f739faaae534f9cb5a7a9cfb32683fddb6be42b8d5db37b458209b014a160
+  metadata.gz: 304a4ed4733a6f648ce0437780519c8c3f3fe874cf3b96ce96d2eea351a5b250
+  data.tar.gz: 295c271a9fff7056a7309fdcd9f07f7206abbc5cc8a8df44fb2cb9f9e0cc273d
 SHA512:
-  metadata.gz: 94b3f5a4455054e596bd5800e7fd3638e425c0e041efb92b27124df292ecfd05b66086881dfa1d52a043f0f0249fce6a56b583dcccd8f23c227641feb0390829
-  data.tar.gz: 9efb17c56cd9b95086e9d01e0b0a64851209d69244bf6e579b96cf427169126eb3c722628cc28b550bb96c1cdeb530996a1facfcd50c506f07e1ece5a698cd26
+  metadata.gz: be00363a9eb23b5797bc81ff39da5e11edb8a8d38bd0558b12b54ac03ac879c1b933f9cf990c03e427387039f16e569df9aaf3b619b28310149672a1f2d7cc19
+  data.tar.gz: 07bef8f427e030ddbf4c636d757836dddc95184e0856be511043f2d281c0d4ddecb60e6367cb3eec2112e4b44eb1650b1c2ce70b18c4e3296499c1d18f8a2571

data/app/assets/stylesheets/application/_modules.scss

@@ -20,4 +20,3 @@
 @import "modules/kids";
 @import "modules/kids_results";
 @import "modules/discussion";
-@import "modules/pagination";

data/app/assets/stylesheets/application/modules/_discussion.scss

@@ -5,6 +5,7 @@ $discussion-toolbar-color: #f6f6fa;
 $message-divider-color: #ecf0f1;
 $discussion-button-color: #fafafa;
 $toolbar-filter-color: #808080;
+$moderator-star-color: #dd9900;
 
 .discussions-list {
   margin: 30px 0;
@@ -41,6 +42,17 @@ $toolbar-filter-color: #808080;
     justify-content: center;
   }
 
+  .discussion-pagination .pagination li {
+    a, span {
+      background-color: lighten($brand-primary, 10%);
+    }
+    &:hover, &.active, &.active:hover {
+      a, span {
+        background-color: $brand-primary;
+      }
+    }
+  }
+
   .discussion-language-icon {
     float: right;
     margin-right: 10px;
@@ -165,6 +177,10 @@ $toolbar-filter-color: #808080;
   width: 100%;
 }
 
+.moderator-star {
+  color: $moderator-star-color;
+}
+
 .discussion-user-menu {
   a {
     padding: 5px 10px;

data/app/assets/stylesheets/application/modules/_kids.scss

@@ -105,6 +105,31 @@ $kids-speech-tabs-width: 40px;
     }
     .mu-kids-character-speech-bubble {
 
+      @media screen and (max-width: $screen-sm-max) {
+        h4 {
+          &.text-warning {
+            font-size: 18px;
+            margin-top: 8px;
+          }
+        }
+        ul.results-list li {
+          font-size: 13px
+        }
+      }
+
+      @media screen and (max-width: $screen-xs-max) {
+        h4 {
+          font-size: 20px;
+          &.text-warning {
+            font-size: 14px;
+            margin-top: 5px;
+          }
+        }
+        ul.results-list li {
+          font-size: 12px
+        }
+      }
+
       &.passed_with_warnings {
         padding-top: 5px;
         padding-bottom: 5px;

data/app/controllers/concerns/organizations_controller_template.rb

@@ -26,7 +26,8 @@ module OrganizationsControllerTemplate
       .permit(:book,
               :contact_email, :name, :locale, :description,
               :logo_url, :banner_url, :open_graph_image_url, :favicon_url, :breadcrumb_image_url,
-              :raise_hand_enabled, :feedback_suggestions_enabled, :public, :immersive,
+              :raise_hand_enabled, :report_issue_enabled, :forum_enabled,
+              :feedback_suggestions_enabled, :public, :immersive,
               :theme_stylesheet, :extension_javascript,
               :terms_of_service, :community_link, login_methods: [])
       .tap { |it| it.merge!(book: Book.find_by!(slug: it[:book])) if it[:book] }

data/app/controllers/discussions_messages_controller.rb

@@ -8,7 +8,7 @@ class DiscussionsMessagesController < AjaxController
 
   def destroy
     message = Message.find(params[:id])
-    message.authorize!
+    message.authorize! current_user
     message.destroy!
     redirect_back(fallback_location: root_path)
   end

data/app/models/assignment.rb

@@ -4,7 +4,7 @@ class Assignment < ApplicationRecord
 
   belongs_to :exercise
   has_one :guide, through: :exercise
-  has_many :messages, -> { order(date: :desc) }, foreign_key: :submission_id, primary_key: :submission_id
+  has_many :messages, -> { where.not(submission_id: nil).order(date: :desc) }, foreign_key: :submission_id, primary_key: :submission_id
 
   belongs_to :submitter, class_name: 'User'
 
@@ -28,7 +28,7 @@ class Assignment < ApplicationRecord
 
   def persist_submission!(submission)
     transaction do
-      messages.destroy_all
+      messages.destroy_all if submission_id.present?
       update! submission_id: submission.id
       update_submissions_count!
       update_last_submission!

data/app/models/message.rb

@@ -28,8 +28,8 @@ class Message < ApplicationRecord
     from_user?(user) || user&.moderator?
   end
 
-  def authorize!
-    raise Mumukit::Auth::UnauthorizedAccessError unless authorized?(current_user)
+  def authorize!(user)
+    raise Mumukit::Auth::UnauthorizedAccessError unless authorized?(user)
   end
 
   def as_platform_json

data/app/views/discussions/_message.html.erb

@@ -6,6 +6,9 @@
         <span class="message-date">
           <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
         </span>
+        <% if user.moderator? %>
+          <%= fa_icon(:star, {'data-toggle': 'tooltip', title: (t :moderator), class: 'moderator-star'}) %>
+        <% end %>
         <% if message.authorized? current_user %>
           <span class="actions">
             <%= link_to fa_icon('trash-o'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>

data/lib/mumuki/laboratory/locales/en.yml

@@ -111,6 +111,7 @@ en:
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
   more_messages: More
+  moderator: Moderator
   mumuki_catchphrase: Improve your programming skills
   mumuki_short_description: Mumuki is a simple, open and collaborative platform for sharing and solving programming exercises. It is aimed to help people with learning and teaching programing languages and paradigms
   my_submissions: My Submissions

data/lib/mumuki/laboratory/locales/es.yml

@@ -122,6 +122,7 @@ es:
   minute: minuto
   minutes: minutos
   more_messages: Ver mensajes anteriores
+  moderator: Moderador
   mumuki_catchphrase: Aprendé a programar
   mumuki_short_description: Mumuki es la plataforma libre y gratuita para aprender a programar, de la práctica a la teoría y en tu idioma
   name: Nombre

data/lib/mumuki/laboratory/locales/pt.yml

@@ -120,6 +120,7 @@ pt:
   minute: minuto
   minutes: minutos
   more_messages: Ver as mensagens anteriores
+  moderator: Moderador
   mumuki_catchphrase: Aprendi a programar
   mumuki_short_description: Mumuki é a plataforma gratuita e gratuita para aprender a programar, desde a prática até a teoria e no seu idioma
   name: Nome

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.6.2'
+    VERSION = '5.6.3'
   end
 end

data/spec/models/discussion_spec.rb

@@ -150,4 +150,17 @@ describe Discussion, organization_workspace: :test do
       it { expect(other_exercise.discussions.for_user(initiator)).to be_empty }
     end
   end
+
+  describe 'messages not being deleted' do
+    let(:user) { create(:user) }
+    let(:other_user) { create(:user) }
+    let(:problem) { create(:problem) }
+    let(:assignment) { problem.submit_solution! user }
+    let(:discussion) { problem.discuss!(user, {title: 'A discussion'})}
+
+    before { discussion.submit_message!({content: 'You should do this'}, user) }
+    before { problem.submit_solution! other_user }
+
+    it { expect(discussion.messages.count).to eq 1 }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.6.3
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,7 +309,6 @@ files:
 - app/assets/stylesheets/application/modules/_modal.scss
 - app/assets/stylesheets/application/modules/_organization_chooser.scss
 - app/assets/stylesheets/application/modules/_overlap.scss
-- app/assets/stylesheets/application/modules/_pagination.scss
 - app/assets/stylesheets/application/modules/_progress_bar.scss
 - app/assets/stylesheets/application/modules/_progress_listing.scss
 - app/assets/stylesheets/application/modules/_timer.scss

data/app/assets/stylesheets/application/modules/_pagination.scss

@@ -1,10 +0,0 @@
-.pagination li {
-  a, span {
-    background-color: lighten($brand-primary, 10%);
-  }
-  &:hover, &.active, &.active:hover {
-    a, span {
-      background-color: $brand-primary;
-    }
-  }
-}