treesame commit of origin/stable/2015-08-29

Treesame-Commit-Id: c856b5f

app/coffeescripts/views/courses/roster/RosterUserView.coffee

@@ -50,6 +50,7 @@ define [
       json.url = "#{ENV.COURSE_ROOT_URL}/users/#{@model.get('id')}"
       json.isObserver = @model.hasEnrollmentType('ObserverEnrollment')
       json.isPending = @model.pending(@model.currentRole)
+      json.canRemoveStudents = ENV.permissions.manage_students and _.all @model.get('enrollments'), (e) -> !e.sis_course_id
       json.canEditSections = not _.isEmpty @model.sectionEditableEnrollments()
       json.canLinkStudents = json.isObserver && !ENV.course.concluded
       json.canViewLoginIdColumn = ENV.permissions.manage_admin_users or ENV.permissions.manage_students

app/controllers/quizzes/quizzes_controller.rb

@@ -220,6 +220,7 @@ def show
       @quiz_menu_tools = external_tools_display_hashes(:quiz_menu)
       @can_take = can_take_quiz?
       if params[:take] && @can_take
+        return false if @quiz.require_lockdown_browser? && !check_lockdown_browser(:highest, named_context_url(@context, 'context_quiz_take_url', @quiz.id))
         # allow starting the quiz via a GET request, but only when using a lockdown browser
         if request.post? || (@quiz.require_lockdown_browser? && !quiz_submission_active?)
           start_quiz!
@@ -861,7 +862,6 @@ def can_take_quiz?
     return true if  params[:preview] && can_do(@quiz, @current_user, :update)
     return false if params[:take] && !authorized_action(@quiz, @current_user, :submit)
     return false if @submission && @submission.completed? && @submission.attempts_left == 0
-    return false if @quiz.require_lockdown_browser? && !check_lockdown_browser(:highest, named_context_url(@context, 'context_quiz_take_url', @quiz.id))
     can_take = Quizzes::QuizEligibility.new(course: @context,
                                             quiz: @quiz,
                                             user: @current_user,

app/models/course.rb

@@ -1508,7 +1508,7 @@ def gradebook_to_csv_in_background(filename, user, options = {})
       self,
       :generate_csv,
       { preserve_method_args: true },
-      options,
+      options.merge(user: user),
       attachment
     )
     {attachment_id: attachment.id, progress_id: progress.id}

app/views/jst/courses/roster/rosterUser.handlebars

@@ -49,10 +49,10 @@
       <li><a href="#" data-event="editSections"><i class="icon-edit"></i> {{#t "links.edit_sections"}}Edit Sections{{/t}}</a></li>
       {{/if}}
       <li><a href="{{url}}"><i class="icon-user"></i> {{#t "links.user_details"}}User Details{{/t}}</a></li>
-      {{#unless sis_user_id }}
+      {{#if canRemoveStudents}}
       <li class="ui-menu-item"><hr /></li>
       <li><a href="#" data-event="removeFromCourse"><i class="icon-trash"></i> {{#t "links.remove_from_course"}}Remove From Course{{/t}}</a></li>
-      {{/unless}}
+      {{/if}}
     </ul>
   </div>
   {{/if}}

config/locales/tr.yml

@@ -7178,6 +7178,7 @@ tr:
     title_for_topics_category: "%{category} Başlıkları"
     warnings: 
       truncated_wiki_title: "Şu wiki sayfanın başlığı kesildi : %{title}"
+  inbox_bb245a60: "Gelen Kutusu"
   include_this_assignment_s_grades_when_posting_to_y_6bff3323: "Okulunuzun Öğrenc Bilgi Sistemine göderirken bu ödevin notlarını da dahil et"
   incorrect_username_and_or_password_2de73abb: "Yanlış kullanıcı adı ve/veya şifre"
   incremental_update_successfully_generated_against__db3f3f06: "Önceki ÖBS içeri aktarımına karşın artış içeren güncelleme başarıyla oluşturuldu."
@@ -7561,6 +7562,13 @@ tr:
         logout_response_redirect_from_idp: "IdP'den LogoutRequest Alındı"
         logout_response_redirect_to_idp: "IdP'ye LogoutResponse Gönderiliyor"
         redirect_from_idp: "IdP'den LoginResponse alındı"
+  login_6f3d6249: "Oturum Aç"
+  login_attribute_731a8181: "Oturum Açma Özelliği"
+  login_is_invalid_must_be_alphanumeric_or_an_email__ae4499b3: "Kullanıcı adı geçersiz: Alfa-sayısal karaktere ya da bir eposta adresi girmelisiniz."
+  login_is_too_long_25373f95: "Kullanıcı adı çok uzun"
+  login_label_1dea0f9d: "Oturum Açma Etiketi"
+  login_with_auth_type_a0aaa52a: "*%{auth_type}* ile oturum aç"
+  login_with_provider_3fd3998e: "%{provider} ile oturum aç"
   low_score_4eeb95b2: "En Düşük : %{score}"
   lower_limit_of_range_6ddd4983: "Aralık alt sınırı"
   lti: 
@@ -10204,6 +10212,10 @@ tr:
       primary_pad: "Primary Pad"
       sketchpad: SketchPad
       typewithme: TypeWith.me
+    facebook: 
+      description: "Facebook ile Giriş"
+    github: 
+      description: "Github Oturum Açma"
     google_docs: 
       description: "Google Docs belge paylaşımı"
       name: "Goolgle Docs"

spec/models/course_spec.rb

@@ -868,6 +868,15 @@ def make_date_completed
   end
 end
 
+describe Course, "gradebook_to_csv_in_background" do
+  it "includes the user who is running it" do
+    teacher_in_course(active_all: true)
+    @course.gradebook_to_csv_in_background("csv.csv", @teacher)
+    GradebookExporter.expects(:new).with(@course, user: @teacher).once
+    run_jobs
+  end
+end
+
 describe Course, "gradebook_to_csv" do
   it "should generate gradebook csv" do
     course_with_student(:active_all => true)