Skip to content

Commit

Permalink
Merge branch 'proxmox:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wy414012 authored Nov 18, 2024
2 parents 9f3bed2 + bf25be2 commit eb590a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion www/manager6/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ Ext.define('PVE.Utils', {
// templates
objType = 'template';
status = type;
} else if (type === 'storage' && record.content.indexOf('import') !== -1) {
} else if (type === 'storage' && record.content === 'import') {
return 'fa fa-cloud-download';
} else {
// everything else
Expand Down
6 changes: 3 additions & 3 deletions www/manager6/panel/BackupAdvancedOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,14 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
value: '__default__',
comboItems: [
['__default__', "Default"],
['data', "Data (experimental)"],
['metadata', "Metadata (experimental)"],
['data', "Data"],
['metadata', "Metadata"],
],
},
endFlex: 2,
endColumn: {
xtype: 'displayfield',
value: gettext("Mode to detect file changes and switch archive encoding format for container backups (NOTE: `data` and `metadata` modes are experimental)."),
value: gettext("Mode to detect file changes and switch archive encoding format for container backups."),
},
},
{
Expand Down

0 comments on commit eb590a6

Please sign in to comment.