Use google docs setting for google drive service

Google Drive will show and hide based on the google docs account setting

fixes: PLAT-911

Test plan:
- google drive checkbox doesn't show up in account settings
- when google drive plugin is enabled, and google doc account setting is set. google drive shows up in the user service area
- make sure google docs, and google drive user services enable and disable properly

Change-Id: Ida49bc6d6f073af5d29ef5a0443e32da59851be5
Reviewed-on: https://gerrit.instructure.com/49003
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
This commit is contained in:
Brad Horrocks 2015-02-18 14:33:36 -07:00 committed by Nathan Mills
parent bae6094fc6
commit 6cfc4c5d65
2 changed files with 7 additions and 7 deletions

View File

@ -1302,7 +1302,7 @@ class Account < ActiveRecord::Base
:google_drive => {
:name => t("account_settings.google_drive", "Google Drive"),
:description => "",
:expose_to_ui => :service
:expose_to_ui => false
},
:google_docs_previews => {
:name => t("account_settings.google_docs_preview", "Google Docs Preview"),

View File

@ -263,7 +263,7 @@ TEXT
</div>
</li>
<li id="unregistered_service_google_drive" class="service" style="<%= hidden if !feature_and_service_enabled?(:google_drive) || services.include?("google_drive") %>">
<li id="unregistered_service_google_drive" class="service" style="<%= hidden if !feature_enabled?(:google_drive) || !feature_and_service_enabled?(:google_docs) || services.include?("google_drive") %>">
<a href="#" class="btn btn-small"><%= image_tag "google_drive_icon.png" %> <%= t('links.google_drive', "Google Drive") %></a>
<div style="display: none; text-align: left;" class="content" title="<%= t('titles.authorize_google_drive', "Authorize Google Drive") %>" id="unregistered_service_google_drive_dialog">
<div>