ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix logic for showing google auth on submissions 

fixes: PLAT-928

test-plan:
make sure that the appropriate information is displayed for the following scenarios for google docs submissions:
no google_drive token
google drive plugin disabled and no google docs token
google drive plugin disabled and a google docs token
google domain restriction not allowing google account

Change-Id: I8b72de3504a5e010fdfa4961ed66babdde31df39
Reviewed-on: https://gerrit.instructure.com/49778
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
This commit is contained in:
Nathan Mills 2015-03-03 10:22:09 -07:00
parent 099bafa228
commit 7605864c03
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/assignments_controller.rb
View File

@ -138,6 +138,7 @@ class AssignmentsController < ApplicationController
@google_drive_upgrade = !!(logged_in_user && Canvas::Plugin.find(:google_drive).try(:settings) &&
(!logged_in_user.user_services.where(service: 'google_drive').first || !(google_docs.verify_access_token rescue false)))
@google_authed = @google_docs_token and not @google_drive_upgrade
add_crumb(@assignment.title, polymorphic_url([@context, @assignment]))

6
app/views/assignments/_submit_assignment.html.erb
View File

@ -209,7 +209,7 @@
<% if @domain_root_account.feature_enabled?(:google_docs_domain_restriction) &&
@domain_root_account.settings[:google_docs_domain] &&
!@current_user.gmail.match(%r{@#{@domain_root_account.settings[:google_docs_domain]}$}) %>
<div id="submit_google_doc_form" class="google_doc_form <%= @google_docs_token ? '' : 'hide' %>">
<div id="submit_google_doc_form" class="google_doc_form <%= @google_authed ? '' : 'hide' %>">
<p class="alert alert-error">
<i class="icon-warning"></i>
<%= t(:invalid_google_docs_domain, 'Invalid domain') %>
@ -226,7 +226,7 @@
</p>
</div>
<% else %>
<%= form_tag(context_url(@context, :controller => :submissions, :assignment_id => @assignment.id, :action => :create), { :id => "submit_google_doc_form", :class => "submit_assignment_form google_doc_form #{@google_docs_token ? '' : 'hide'}"}) do %>
<%= form_tag(context_url(@context, :controller => :submissions, :assignment_id => @assignment.id, :action => :create), { :id => "submit_google_doc_form", :class => "submit_assignment_form google_doc_form #{@google_authed ? '' : 'hide'}"}) do %>
<%= hidden_field :submission, :submission_type, :value => "google_doc" %>
<%= hidden_field :google_doc, :document_id, :value => "", :class => "google_doc_id" %>
<table class="formtable" style="width: 100%;">
@ -270,7 +270,7 @@
<% end %>
<% end %>
<% if @google_drive_upgrade %>
<div id="submit_google_doc_form" class="google_doc_form auth <%= @google_docs_token ? 'hide' : '' %>">
<div id="submit_google_doc_form" class="google_doc_form auth <%= @google_drive_upgrade ? '' : 'hide' %>">
<%= t 'messages.google_drives_auth_required', "Before you can submit assignments directly from Google Drive you need to authorize Canvas to access your Google Drive account:" %>
<div style="font-size: 1.1em; text-align: center; margin: 10px;">
<a class="btn" id="auth-google" href="<%= oauth_url(:service => :google_drive, :return_to => (request.url + "#submit_google_doc_form")) %>"><%= t 'links.authorize_google_drive', "Authorize Google Drive Access" %></a>