fix faculty journal checks

Change-Id: I23692f617b6949cfc13eed3e6c1046b0c723c0f5
Reviewed-on: https://gerrit.instructure.com/5206
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>

Author: jenseng

app/coffeescripts/messages.coffee

@@ -541,7 +541,7 @@ I18n.scoped 'conversations', (I18n) ->
       $form.attr action: $selected_conversation.find('a.details_link').attr('add_url')
 
     reset_message_form()
-    $form.find('#user_note_info').showIf($selected_conversation?.hasClass('private')).find('input').attr('checked', false)
+    $form.find('#user_note_info').hide().find('input').attr('checked', false)
     $form.show().find(':input:visible:first').focus()
 
   reset_message_form = ->
@@ -610,6 +610,13 @@ I18n.scoped 'conversations', (I18n) ->
       for user in data.participants when !MessageInbox.user_cache[user.id]?.avatar
         MessageInbox.user_cache[user.id] = user
         user.html_name = html_name_for_user(user)
+      $form.find('#user_note_info').showIf(
+          $c.hasClass('private') and
+          (user_id = $c.find('.participant').first().data('id')) and
+          (user = MessageInbox.user_cache[user_id]) and
+          can_add_notes_for(user)
+        )
+      inbox_resize()
       $messages.show()
       i = j = 0
       message = data.messages[0]
@@ -656,9 +663,10 @@ I18n.scoped 'conversations', (I18n) ->
     $.htmlEscape(user.name) + if shared_contexts.length then " <em>" + $.htmlEscape(shared_contexts) + "</em>" else ''
 
   can_add_notes_for = (user) ->
+    return false unless MessageInbox.notes_enabled
     return true if user.can_add_notes
     for course_id, roles of user.common_courses
-      return true if 'StudentEnrollment' in roles and (MessageInbox.can_add_notes or MessageInbox.contexts.courses[course_id]?.can_add_notes)
+      return true if 'StudentEnrollment' in roles and (MessageInbox.can_add_notes_for_account or MessageInbox.contexts.courses[course_id]?.can_add_notes)
     false
 
   formatted_message = (message) ->
@@ -1423,6 +1431,7 @@ I18n.scoped 'conversations', (I18n) ->
         $form.find('#group_conversation').attr('checked', true)
         $form.find('#group_conversation_info').hide()
         $form.find('#user_note_info').showIf((user = MessageInbox.user_cache[tokens[0]]) and can_add_notes_for(user))
+      inbox_resize()
 
     $(window).resize inbox_resize
     setTimeout inbox_resize

app/helpers/application_helper.rb

@@ -204,7 +204,7 @@ def context_url(context, *opts)
 
   def message_user_path(user)
     params = {:user_id => user.id, :user_name => user.short_name}
-    params[:can_add_notes] = true if user.grants_right?(@current_user, :create_user_notes)
+    params[:can_add_notes] = true if user.grants_right?(@current_user, :create_user_notes) && user.associated_accounts.any?{|a| a.enable_user_notes }
     conversations_path + "#/conversations?" + params.to_query.gsub('+', '%20')
   end
 

app/models/conversation_message.rb

@@ -125,7 +125,7 @@ def format_event_message
   def generate_user_note
     return unless recipients.size == 1
     recipient = recipients.first
-    return unless recipient.grants_right?(author, :create_user_notes)
+    return unless recipient.grants_right?(author, :create_user_notes) && recipient.associated_accounts.any?{|a| a.enable_user_notes }
 
     self.extend TextHelper
     title = t(:subject, "Private message, %{timestamp}", :timestamp => date_string(created_at))

app/views/conversations/index.html.erb

@@ -222,7 +222,9 @@
     MessageInbox.initial_conversations_count = <%= @conversations_count %>;
     MessageInbox.scope = <%= raw @scope.to_json %>;
     MessageInbox.label_scope = <%= raw @label.to_json %>;
-    MessageInbox.can_add_notes = <%= raw @current_user.associated_accounts.any?{|a| a.enable_user_notes && a.grants_right?(@current_user, nil, :manage_students) } %>;
+    <% # TODO: get note-enabled-ness per account, and cross reference with the recipient's associated account ids. this is already enforced in the model %>
+    MessageInbox.notes_enabled = <%= raw @current_user.associated_accounts.any?{|a| a.enable_user_notes } %>;
+    MessageInbox.can_add_notes_for_account = MessageInbox.notes_enabled && <%= raw @current_user.associated_accounts.any?{|a| a.grants_right?(@current_user, nil, :manage_students) } %>;
     <% unless @current_user.watched_conversations_intro? %>
     $.conversationsIntroSlideshow()
     <% end %>

public/javascripts/compiled/messages.js

@@ -25,6 +25,7 @@ def conversation(num_other_users = 1)
       enrollment = @course.enroll_student(u)
       enrollment.workflow_state = 'active'
       enrollment.save
+      u.associated_accounts << Account.default
       u.id
     }
     @conversation = @user.initiate_conversation(user_ids)
@@ -174,7 +175,9 @@ def conversation(num_other_users = 1)
     end
 
     it "should generate a user note when requested" do
+      Account.default.update_attribute :enable_user_notes, true
       course_with_teacher_logged_in(:active_all => true)
+      @teacher.associated_accounts << Account.default
       conversation
 
       post 'add_message', :conversation_id => @conversation.conversation_id, :body => "hello world"

spec/controllers/conversations_controller_spec.rb

@@ -109,8 +109,11 @@ def add_last_student
 
   context "generate_user_note" do
     it "should add a user note under nominal circumstances" do
+      Account.default.update_attribute :enable_user_notes, true
       course_with_teacher
+      @teacher.associated_accounts << Account.default
       student = student_in_course.user
+      student.associated_accounts << Account.default
       conversation = @teacher.initiate_conversation([student.id])
       message = conversation.add_message("reprimanded!")
       message.created_at = Time.at(0) # Jan 1, 1970 00:00:00 UTC
@@ -122,10 +125,26 @@ def add_last_student
       note.note.should eql("reprimanded!")
     end
 
+    it "should fail if notes are disabled on the account" do
+      Account.default.update_attribute :enable_user_notes, false
+      course_with_teacher
+      @teacher.associated_accounts << Account.default
+      student = student_in_course.user
+      student.associated_accounts << Account.default
+      conversation = @teacher.initiate_conversation([student.id])
+      message = conversation.add_message("reprimanded!")
+      message.generate_user_note.should be_nil
+      student.user_notes.size.should be(0)
+    end
+
     it "should fail if there's more than one recipient" do
+      Account.default.update_attribute :enable_user_notes, true
       course_with_teacher
+      @teacher.associated_accounts << Account.default
       student1 = student_in_course.user
+      student1.associated_accounts << Account.default
       student2 = student_in_course.user
+      student2.associated_accounts << Account.default
       conversation = @teacher.initiate_conversation([student1.id, student2.id])
       message = conversation.add_message("message")
       message.generate_user_note.should be_nil