Fixed image widget not displaying file selected using fileselect

winskie · winskie · commit 0eeb8267348d · 2017-01-26T15:31:47.000+08:00
diff --git a/inc/files/files.ctrl.php b/inc/files/files.ctrl.php
@@ -146,8 +146,8 @@
 	memorize_param( 'action', 'string', '', $action );
 }
 
-if( ! empty( $action ) && substr( $fm_mode, 0, 5 ) != 'link_' )
-{	// The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...)
+if( ! empty( $action ) && substr( $fm_mode, 0, 5 ) != 'link_' && $fm_mode != 'file_select' )
+{	// The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...) and file_select
 	$fm_mode = '';
 }
 
diff --git a/inc/files/views/_file_list.inc.php b/inc/files/views/_file_list.inc.php
@@ -339,7 +339,7 @@
 					$link_action = 'set_field';
 					$link_attribs['target'] = '_parent';
 					$link_attribs['class'] = 'action_icon select_file btn btn-primary btn-xs';
-					$link_attribs['onclick'] = 'return window.parent.file_select_add( select_field_name, \''.$sfile_root.'\', \''.$sfile_path.'\' );';
+					$link_attribs['onclick'] = 'return window.parent.file_select_add( \''.$field_name.'\', \''.$sfile_root.'\', \''.$sfile_path.'\' );';
 					echo action_icon( T_('Select file'), 'link',
 							regenerate_url( 'fm_selected', 'action=file_select&amp;fm_selected[]='.rawurlencode($lFile->get_rdfp_rel_path()).'&amp;'.url_crumb('file') ),
 							' '.T_('Select'), NULL, 5, $link_attribs );
@@ -581,7 +581,7 @@
 				$link_action = 'set_field';
 				$link_attribs['target'] = '_parent';
 				$link_attribs['class'] = 'action_icon select_file btn btn-primary btn-xs';
-				$link_attribs['onclick'] = 'return window.parent.file_select_add( select_field_name, \''.$sfile_root.'\', \''.'$file_path$'.'\' );';
+				$link_attribs['onclick'] = 'return window.parent.file_select_add( \''.$field_name.'\', \''.$sfile_root.'\', \''.'$file_path$'.'\' );';
 				$icon_to_select_files = action_icon( T_('Select file'), 'link',
 						regenerate_url( 'fm_selected', 'action=file_select&amp;fm_selected[]='.'$file_path$'.'&amp;'.url_crumb('file') ),
 						' '.T_('Select'), NULL, 5, $link_attribs ).' ';
@@ -760,8 +760,6 @@
 		?>
 		<script type="text/javascript">
 			<!--
-			var select_field_name = '<?php echo $field_name;?>';
-
 			function js_act_on_selected()
 			{
 				// There may be an easier selector than below but couldn't make sense of it :(
diff --git a/inc/widgets/widgets/_coll_logo.widget.php b/inc/widgets/widgets/_coll_logo.widget.php
@@ -214,7 +214,7 @@ function display( $params )
 			$File = & $FileCache->get_by_ID( $file_ID, false );
 		}
 
-		if( ( $check_file == 'check' || $check_file === '1' ) && ! $File && ! file_exists( $image_path.$this->disp_params['logo_file'] ) )
+		if( ( $check_file == 'check' || $check_file === '1' ) && ( empty( $File ) || ! file_exists( $File->get_full_path() ) ) && ! file_exists( $image_path.$this->disp_params['logo_file'] ) )
 		{ // Logo file doesn't exist, Exit here because widget setting requires this:
 			return true;
 		}
diff --git a/inc/widgets/widgets/_image.widget.php b/inc/widgets/widgets/_image.widget.php
@@ -207,7 +207,7 @@ function display( $params )
 				break;
 		}
 
-		if( $this->disp_params['check_file'] && ! file_exists( $image_path.$this->disp_params['image_file'] ) )
+		if( $this->disp_params['check_file'] && ( empty( $File ) || ! file_exists( $File->get_full_path() ) ) && ! file_exists( $image_path.$this->disp_params['image_file'] ) )
 		{ // Logo file doesn't exist, Exit here because of widget setting requires this
 			return true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@`
`146`	`146`	`memorize_param( 'action', 'string', '', $action );`
`147`	`147`	`}`
`148`	`148`
`149`		`-if( ! empty( $action ) && substr( $fm_mode, 0, 5 ) != 'link_' )`
`150`		`-{ // The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...)`
	`149`	`+if( ! empty( $action ) && substr( $fm_mode, 0, 5 ) != 'link_' && $fm_mode != 'file_select' )`
	`150`	`+{ // The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...) and file_select`
`151`	`151`	`$fm_mode = '';`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ function display( $params )`
`214`	`214`	`$File = & $FileCache->get_by_ID( $file_ID, false );`
`215`	`215`	`}`
`216`	`216`
`217`		`- if( ( $check_file == 'check' \|\| $check_file === '1' ) && ! $File && ! file_exists( $image_path.$this->disp_params['logo_file'] ) )`
	`217`	`+ if( ( $check_file == 'check' \|\| $check_file === '1' ) && ( empty( $File ) \|\| ! file_exists( $File->get_full_path() ) ) && ! file_exists( $image_path.$this->disp_params['logo_file'] ) )`
`218`	`218`	`{ // Logo file doesn't exist, Exit here because widget setting requires this:`
`219`	`219`	`return true;`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ function display( $params )`
`207`	`207`	`break;`
`208`	`208`	`}`
`209`	`209`
`210`		`- if( $this->disp_params['check_file'] && ! file_exists( $image_path.$this->disp_params['image_file'] ) )`
	`210`	`+ if( $this->disp_params['check_file'] && ( empty( $File ) \|\| ! file_exists( $File->get_full_path() ) ) && ! file_exists( $image_path.$this->disp_params['image_file'] ) )`
`211`	`211`	`{ // Logo file doesn't exist, Exit here because of widget setting requires this`
`212`	`212`	`return true;`
`213`	`213`	`}`