Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions keepercommander/commands/pam_import/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@ def load(cls, data: Union[str, dict]):

# disable_dynamic_resizing ? "" : "display-update"
val = utils.value_to_boolean(data.get("disable_dynamic_resizing", None))
if val is not True: obj.resizeMethod = "display-update"
obj.resizeMethod = "" if val is True else "display-update"

return obj

Expand Down Expand Up @@ -2272,7 +2272,7 @@ def to_record_dict(self):
kvp["enableWallpaper"] = self.enableWallpaper

# populated on load - "resizeMethod": disable_dynamic_resizing ? "" : "display-update"
if str(self.resizeMethod) == "display-update":
if isinstance(self.resizeMethod, str):
kvp["resizeMethod"] = self.resizeMethod

if isinstance(self.sftp, SFTPConnectionSettings):
Expand Down
18 changes: 16 additions & 2 deletions keepercommander/commands/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,14 +732,28 @@ def _format_expiration(expiration_value):
if total_matches == 1:
# If only one match, display it directly
if len(matched_records) == 1:
return self.execute(params, uid=matched_records[0].record_uid, format=fmt, unmask=kwargs.get('unmask'), legacy=kwargs.get('legacy'))
return self.execute(
params,
uid=matched_records[0].record_uid,
format=fmt,
unmask=kwargs.get('unmask'),
legacy=kwargs.get('legacy'),
include_dag=kwargs.get('include_dag')
)
elif len(matched_folders) == 1:
uid = matched_folders[0].uid
f = params.folder_cache[uid]
sf_uid = f.uid if isinstance(f, subfolder.SharedFolderNode) else \
(f.shared_folder_uid if isinstance(f, subfolder.SharedFolderFolderNode) else None)
if sf_uid and api.is_shared_folder(params, sf_uid):
return self.execute(params, uid=sf_uid, format=fmt, unmask=kwargs.get('unmask'), legacy=kwargs.get('legacy'))
return self.execute(
params,
uid=sf_uid,
format=fmt,
unmask=kwargs.get('unmask'),
legacy=kwargs.get('legacy'),
include_dag=kwargs.get('include_dag')
)
if fmt == 'json':
fo = {
'folder_uid': f.uid,
Expand Down
2 changes: 1 addition & 1 deletion keepercommander/commands/record_edit.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ def assign_typed_fields(self, record, fields):
value = vault.TypedField.import_schedule_field(parsed_field.value)
else:
self.on_warning(f'Unsupported field type: {record_field.type}')
if value:
if value is not None:
if isinstance(value, list):
record_field.value.clear()
record_field.value.extend(value)
Expand Down
4 changes: 2 additions & 2 deletions keepercommander/vault_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def extract_typed_field(field): # type: (vault.TypedField) -> dict
if rt.type in record_types.FieldTypes:
ft = record_types.FieldTypes[rt.type]
default_value = ft.value
if field.value:
if field.value is not None:
values = field.value
if isinstance(values, (str, int, dict)):
values = [values]
Expand All @@ -410,7 +410,7 @@ def extract_typed_field(field): # type: (vault.TypedField) -> dict

if isinstance(values, list):
for value in values:
if not value:
if value is None:
continue
if default_value is not None:
if not isinstance(value, type(default_value)):
Expand Down
Loading