*** gui/javascript/test_automation.js	Thu Sep 10 13:21:42 2009
--- gui/javascript/test_automation.js	Sat Sep 12 08:37:01 2009
***************
*** 16,23 ****
    returns: A pop-up window which facilitates XML import
  
  */
! function openImportResult(windows_title) {
! 	window.open(fRoot+"lib/results/resultsImport.php",
  	            windows_title,
  	            "menubar=no,width=650,height=500,toolbar=no,scrollbars=yes");
  	if (window.focus) {newwindow.focus()}
--- 16,23 ----
    returns: A pop-up window which facilitates XML import
  
  */
! function openImportResult(windows_title,build_id) {
! 	window.open(fRoot+"lib/results/resultsImport.php?build="+build_id,
  	            windows_title,
  	            "menubar=no,width=650,height=500,toolbar=no,scrollbars=yes");
  	if (window.focus) {newwindow.focus()}
*** gui/templates/execute/execSetResults.tpl	Thu Sep 10 13:21:42 2009
--- gui/templates/execute/execSetResults.tpl	Sat Sep 12 22:31:43 2009
***************
*** 73,78 ****
--- 73,79 ----
  <script language="JavaScript" type="text/javascript">
  var msg="{$labels.warning_delete_execution}";
  var import_xml_results="{$labels.import_xml_results}";
+ var import_xml_results=import_xml_results.replace(/ /g, "_");
  </script>
  
  {include file="inc_del_onclick.tpl"}
***************
*** 324,330 ****
      	    	         value="{lang_get s=$gui->history_status_btn_name}" />
      	    	  <input type="button" id="pop_up_import_button" name="import_xml_button"
      	    	         value="{$labels.import_xml_results}"
!     	    	         onclick="javascript: openImportResult(import_xml_results);" />
            
                {* 20081125 - franciscom - BUGID 1902*}
  		          {if $tlCfg->exec_cfg->enable_test_automation }
--- 325,331 ----
      	    	         value="{lang_get s=$gui->history_status_btn_name}" />
      	    	  <input type="button" id="pop_up_import_button" name="import_xml_button"
      	    	         value="{$labels.import_xml_results}"
!     	    	         onclick="javascript: openImportResult(import_xml_results,{$gui->build_id});" />
            
                {* 20081125 - franciscom - BUGID 1902*}
  		          {if $tlCfg->exec_cfg->enable_test_automation }
*** lib/execute/execSetResults.php	Thu Sep 10 13:21:44 2009
--- lib/execute/execSetResults.php	Sat Sep 12 22:31:50 2009
***************
*** 883,888 ****
--- 883,889 ----
      $tprojectMgr = new testproject($dbHandler);
      $gui->tcasePrefix = $tprojectMgr->getTestCasePrefix($argsObj->tproject_id);
      $build_info = $buildMgr->get_by_id($argsObj->build_id);
+     $gui->build_id = $argsObj->build_id;
      $gui->build_notes=$build_info['notes'];
      $gui->build_is_open=($build_info['is_open'] == 1 ? 1 : 0);
      $gui->execution_types=$tcaseMgr->get_execution_types();
*** lib/results/resultsImport.php	Thu Sep 10 13:21:44 2009
--- lib/results/resultsImport.php	Sat Sep 12 22:31:56 2009
***************
*** 42,48 ****
  $file_check=array('status_ok' => 1, 'msg' => 'ok');
  
  $import_title=lang_get('title_results_import_to');
! $container_description=lang_get('import_results');
  
  if ($args->doUpload)
  {
--- 42,48 ----
  $file_check=array('status_ok' => 1, 'msg' => 'ok');
  
  $import_title=lang_get('title_results_import_to');
! $container_description=lang_get('import_xml_results');
  
  if ($args->doUpload)
  {
***************
*** 94,99 ****
--- 94,101 ----
  $smarty->assign('resultMap',$resultMap); 
  $smarty->assign('importTypes',$import_file_types);
  $smarty->assign('testprojectName', $args->testprojectName);
+ $smarty->assign('container_description', $container_description);
+ $smarty->assign('importLimit',TL_IMPORT_LIMIT);
  $smarty->assign('importLimitKB',TL_IMPORT_LIMIT / 1024);
  $smarty->assign('bImport',strlen($args->importType));
  $smarty->display($template_dir .'resultsImport.tpl');