Bug/sc 19462/new editor s gdocs export ignores some layout

sefaria/model/user_profile.py

@@ -832,7 +832,7 @@ def public_user_data(uid, ignore_cache=False):
 
     data = {
         "name": profile.full_name,
-        "profileUrl": "/profile/" + profile.slug,
+        "profileUrl": "/sheets/profile/" + profile.slug,
         "imageUrl": profile.profile_pic_url_small,
         "position": profile.position,
         "organization": profile.organization,

sefaria/sheets.py

@@ -861,7 +861,7 @@ def get_sheets_for_ref(tref, uid=None, in_collection=None):
 				"assignerName":	   sheet.get("assignerName", None),
 				"viaOwnerProfileUrl":	   sheet.get("viaOwnerProfileUrl", None),
 				"assignerProfileUrl":	   sheet.get("assignerProfileUrl", None),
-				"ownerProfileUrl": "/profile/" + ownerData["slug"],
+				"ownerProfileUrl": "/sheets/profile/" + ownerData["slug"],
 				"ownerImageUrl":   ownerData.get('profile_pic_url_small',''),
 				"status":          sheet["status"],
 				"views":           sheet["views"],

sourcesheets/views.py

@@ -170,6 +170,7 @@ def make_sheet_class_string(sheet):
     """
     Returns a string of class names corresponding to the options of sheet.
     """
+
     o = sheet["options"]
     classes = []
     classes.append(o.get("language", "bilingual"))
@@ -1053,8 +1054,6 @@ def sheet_to_html_string(sheet):
     Create the html string of sheet with sheet_id.
     """
     sheet["sources"] = annotate_user_links(sheet["sources"])
-    sheet = resolve_options_of_sources(sheet)
-
     try:
         owner = User.objects.get(id=sheet["owner"])
         author = owner.first_name + " " + owner.last_name
@@ -1079,23 +1078,6 @@ def sheet_to_html_string(sheet):
     return render_to_string('gdocs_sheet.html', context)
 
 
-def resolve_options_of_sources(sheet):
-    for source in sheet['sources']:
-        if 'text' not in source:
-            continue
-        options = source.setdefault('options', {})
-        if not options.get('sourceLanguage'):
-            source['options']['sourceLanguage'] = sheet['options'].get(
-                'language', 'bilingual')
-        if not options.get('sourceLayout'):
-            source['options']['sourceLayout'] = sheet['options'].get(
-                'layout', 'sideBySide')
-        if not options.get('sourceLangLayout'):
-            source['options']['sourceLangLayout'] = sheet['options'].get(
-                'langLayout', 'heRight')
-    return sheet
-
-
 
 @gauth_required(scope=['openid', 'https://www.googleapis.com/auth/drive.file', 'https://www.googleapis.com/auth/userinfo.email'], ajax=True)
 def export_to_drive(request, credential, sheet_id):
@@ -1105,16 +1087,18 @@ def export_to_drive(request, credential, sheet_id):
     # Using credentials in google-api-python-client.
     service = build('drive', 'v3', credentials=credential, cache_discovery=False)
     user_info_service = build('oauth2', 'v2', credentials=credential, cache_discovery=False)
-
     sheet = get_sheet(sheet_id)
     if 'error' in sheet:
         return jsonResponse({'error': {'message': sheet["error"]}})
 
+    options = {'language': request.GET.get("language", "bilingual"),
+               'layout': request.GET.get("layout", "heRight")}
+    sheet['options'] = sheet['options'] | options
+
     file_metadata = {
         'name': strip_tags(sheet['title'].strip()),
         'mimeType': 'application/vnd.google-apps.document'
     }
-
     html_string = bytes(sheet_to_html_string(sheet), "utf8")
 
     media = MediaIoBaseUpload(