mirror of
				https://github.com/immich-app/immich.git
				synced 2025-10-31 10:49:11 -04:00 
			
		
		
		
	fix(web): reset to default button always being shown (#8577)
This commit is contained in:
		
							parent
							
								
									4b622e6cfa
								
							
						
					
					
						commit
						0aa5d3daeb
					
				| @ -355,7 +355,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['ffmpeg'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['ffmpeg'] })} | ||||||
|           on:save={() => dispatch('save', { ffmpeg: config.ffmpeg })} |           on:save={() => dispatch('save', { ffmpeg: config.ffmpeg })} | ||||||
|           showResetToDefault={!isEqual(savedConfig.ffmpeg, defaultConfig)} |           showResetToDefault={!isEqual(savedConfig.ffmpeg, defaultConfig.ffmpeg)} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -81,7 +81,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['image'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['image'] })} | ||||||
|           on:save={() => dispatch('save', { image: config.image })} |           on:save={() => dispatch('save', { image: config.image })} | ||||||
|           showResetToDefault={!isEqual(savedConfig, defaultConfig)} |           showResetToDefault={!isEqual(savedConfig.image, defaultConfig.image)} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -29,7 +29,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['newVersionCheck'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['newVersionCheck'] })} | ||||||
|           on:save={() => dispatch('save', { newVersionCheck: config.newVersionCheck })} |           on:save={() => dispatch('save', { newVersionCheck: config.newVersionCheck })} | ||||||
|           showResetToDefault={!isEqual(savedConfig, defaultConfig)} |           showResetToDefault={!isEqual(savedConfig.newVersionCheck, defaultConfig.newVersionCheck)} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -41,7 +41,7 @@ | |||||||
|           <SettingButtonsRow |           <SettingButtonsRow | ||||||
|             on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['server'] })} |             on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['server'] })} | ||||||
|             on:save={() => dispatch('save', { server: config.server })} |             on:save={() => dispatch('save', { server: config.server })} | ||||||
|             showResetToDefault={!isEqual(savedConfig, defaultConfig)} |             showResetToDefault={!isEqual(savedConfig.server, defaultConfig.server)} | ||||||
|             {disabled} |             {disabled} | ||||||
|           /> |           /> | ||||||
|         </div> |         </div> | ||||||
|  | |||||||
| @ -236,7 +236,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['storageTemplate'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['storageTemplate'] })} | ||||||
|           on:save={() => dispatch('save', { storageTemplate: config.storageTemplate })} |           on:save={() => dispatch('save', { storageTemplate: config.storageTemplate })} | ||||||
|           showResetToDefault={!isEqual(savedConfig, defaultConfig) && !minified} |           showResetToDefault={!isEqual(savedConfig.storageTemplate, defaultConfig.storageTemplate) && !minified} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       {/if} |       {/if} | ||||||
|  | |||||||
| @ -45,7 +45,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['trash'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['trash'] })} | ||||||
|           on:save={() => dispatch('save', { trash: config.trash })} |           on:save={() => dispatch('save', { trash: config.trash })} | ||||||
|           showResetToDefault={!isEqual(savedConfig, defaultConfig)} |           showResetToDefault={!isEqual(savedConfig.trash, defaultConfig.trash)} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -36,7 +36,7 @@ | |||||||
|         <SettingButtonsRow |         <SettingButtonsRow | ||||||
|           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['user'] })} |           on:reset={({ detail }) => dispatch('reset', { ...detail, configKeys: ['user'] })} | ||||||
|           on:save={() => dispatch('save', { user: config.user })} |           on:save={() => dispatch('save', { user: config.user })} | ||||||
|           showResetToDefault={!isEqual(savedConfig, defaultConfig)} |           showResetToDefault={!isEqual(savedConfig.user, defaultConfig.user)} | ||||||
|           {disabled} |           {disabled} | ||||||
|         /> |         /> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user