Browse Source

Fix: remove duplicates from merge conflict

pull/142/head
Jose Olarte III 1 day ago
parent
commit
c002c9e245
  1. 17
      src/components/GiftedDialog.vue

17
src/components/GiftedDialog.vue

@ -228,9 +228,6 @@ export default class GiftedDialog extends Vue {
// Update entity types based on current props // Update entity types based on current props
this.updateEntityTypes(); this.updateEntityTypes();
// Update entity types based on current props
this.updateEntityTypes();
try { try {
const settings = await databaseUtil.retrieveSettingsForActiveAccount(); const settings = await databaseUtil.retrieveSettingsForActiveAccount();
this.apiServer = settings.apiServer || ""; this.apiServer = settings.apiServer || "";
@ -373,20 +370,6 @@ export default class GiftedDialog extends Vue {
return; return;
} }
// Check for person conflict
if (this.hasPersonConflict) {
this.$notify(
{
group: "alert",
type: "danger",
title: "Error",
text: "You cannot select the same person as both giver and recipient.",
},
3000,
);
return;
}
this.close(); this.close();
this.$notify( this.$notify(
{ {

Loading…
Cancel
Save