[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[raeburn]

raeburn		Tue May 24 18:21:43 2022 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Bug 6754 and 6907
    - Return to last location from /adm/searchcat should be to _parent for 
      launch from LTI Consumer and/or deep-link with target set to Embedded.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.401 loncom/interface/lonhtmlcommon.pm:1.402
--- loncom/interface/lonhtmlcommon.pm:1.401	Tue May 24 16:23:03 2022
+++ loncom/interface/lonhtmlcommon.pm	Tue May 24 18:21:43 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.401 2022/05/24 16:23:03 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.402 2022/05/24 18:21:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1980,10 +1980,10 @@
             if ($env{'request.noversionuri'} eq '/adm/searchcat') {
                 $hashref->{'target'} = '_top';
                 if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
-                    $hashref->{'target'} = '';
+                    $hashref->{'target'} = '_parent';
                 }
-                if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
-                    $hashref->{'target'} = $env{'request.deeplink.target'};
+                if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
+                    $hashref->{'target'} = '_parent';
                 }
             }
             $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',