vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #25311 from barredterra/refactor-in-list

Browse source 
refactor: replace `in_list(array, member)` with `array.includes(member)`
This commit is contained in:
Ankush Menat 2024-03-10 22:28:58 +05:30 • committed by GitHub
commit e96c5755d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/printing/page/print_format_builder/print_format_builder_field.html
View file

@ -10,7 +10,7 @@
data-columns="{%= me.get_visible_columns_string(field) %}"
data-doctype="{%= field.options %}"
{% } %}>
{% if !in_list(["Table", "HTML", "Custom HTML"], field.fieldtype) %}
{% if !["Table", "HTML", "Custom HTML"].includes(field.fieldtype) %}
<a class="field-settings pull-right">
<span>
<svg class="icon icon-sm"><use href="#icon-setting-gear"></use></svg>

2
frappe/printing/page/print_format_builder/print_format_builder_sidebar.html
View file

@ -4,7 +4,7 @@
</div>
<div class="print-format-builder-sidebar-fields">
{% for (var i=0, l=fields.length; i < l; i++) { var f = fields[i]; %}
{% if(!in_list(["Section Break", "Tab Break", "Column Break", "Fold"], f.fieldtype)) { %}
{% if(!["Section Break", "Tab Break", "Column Break", "Fold"].includes(f.fieldtype)) { %}
<div class="print-format-builder-field-placeholder"
data-fieldname="{%= f.fieldname %}">
<div title="{{f.label}}" class="field-label btn btn-default btn-sm sidebar-field ellipsis

4
frappe/public/js/form_builder/components/FieldProperties.vue
View file

@ -26,7 +26,7 @@ let docfield_df = computed(() => {
}
if (
in_list(["fetch_from", "fetch_if_empty"], df.fieldname) &&
["fetch_from", "fetch_if_empty"].includes(df.fieldname) &&
in_list(frappe.model.no_value_type, store.form.selected_field.fieldtype)
) {
return false;
@ -41,7 +41,7 @@ let docfield_df = computed(() => {
df.options = "";
args.value = {};
if (in_list(["Table", "Link"], store.form.selected_field.fieldtype)) {
if (["Table", "Link"].includes(store.form.selected_field.fieldtype)) {
df.fieldtype = "Link";
df.options = "DocType";

6
frappe/public/js/workflow_builder/components/Properties.vue
View file

@ -18,13 +18,13 @@ let properties = computed(() => {
if (store.workflow.selected && "action" in store.workflow.selected.data) {
title.value = "Transition Properties";
return store.transitionfields.filter((df) =>
in_list(["action", "allowed", "allow_self_approval", "condition"], df.fieldname)
["action", "allowed", "allow_self_approval", "condition"].includes(df.fieldname)
);
} else if (store.workflow.selected && "state" in store.workflow.selected.data) {
title.value = "State Properties";
let allow_edit = store.statefields.find((df) => df.fieldname == "allow_edit");
store.statefields = store.statefields.filter(
(df) => !in_list(["allow_edit", "workflow_builder_id"], df.fieldname)
(df) => !["allow_edit", "workflow_builder_id"].includes(df.fieldname)
);
store.statefields.splice(2, 0, allow_edit);
@ -41,7 +41,7 @@ let properties = computed(() => {
}
title.value = "Workflow Details";
return store.workflowfields.filter(
(df) => !in_list(["states", "transitions", "workflow_data", "workflow_name"], df.fieldname)
(df) => !["states", "transitions", "workflow_data", "workflow_name"].includes(df.fieldname)
);
});
</script>