diff --git a/object/application.go b/object/application.go index f8a03f32..d3de2d29 100644 --- a/object/application.go +++ b/object/application.go @@ -206,6 +206,10 @@ func UpdateApplication(id string, application *Application) bool { return false } + if name == "app-built-in" { + application.Name = name + } + for _, providerItem := range application.Providers { providerItem.Provider = nil } @@ -234,6 +238,10 @@ func AddApplication(application *Application) bool { } func DeleteApplication(application *Application) bool { + if application.Name == "app-built-in" { + return false + } + affected, err := adapter.Engine.ID(core.PK{application.Owner, application.Name}).Delete(&Application{}) if err != nil { panic(err) diff --git a/object/organization.go b/object/organization.go index bc5f2966..687b4075 100644 --- a/object/organization.go +++ b/object/organization.go @@ -112,6 +112,10 @@ func UpdateOrganization(id string, organization *Organization) bool { return false } + if name == "built-in" { + organization.Name = name + } + if organization.MasterPassword != "" { credManager := cred.GetCredManager(organization.PasswordType) if credManager != nil { @@ -138,6 +142,10 @@ func AddOrganization(organization *Organization) bool { } func DeleteOrganization(organization *Organization) bool { + if organization.Name == "built-in" { + return false + } + affected, err := adapter.Engine.ID(core.PK{organization.Owner, organization.Name}).Delete(&Organization{}) if err != nil { panic(err) diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js index 3edfc527..0153ff07 100644 --- a/web/src/ApplicationEditPage.js +++ b/web/src/ApplicationEditPage.js @@ -132,7 +132,7 @@ class ApplicationEditPage extends React.Component { {Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} : - { + { this.updateApplicationField('name', e.target.value); }} /> diff --git a/web/src/ApplicationListPage.js b/web/src/ApplicationListPage.js index 447d318f..73e600a7 100644 --- a/web/src/ApplicationListPage.js +++ b/web/src/ApplicationListPage.js @@ -236,8 +236,9 @@ class ApplicationListPage extends React.Component { this.deleteApplication(index)} + disabled={record.name === "app-built-in"} > - + ) diff --git a/web/src/OrganizationEditPage.js b/web/src/OrganizationEditPage.js index fa2390bf..973c44a8 100644 --- a/web/src/OrganizationEditPage.js +++ b/web/src/OrganizationEditPage.js @@ -94,7 +94,7 @@ class OrganizationEditPage extends React.Component { {Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} : - { + { this.updateOrganizationField('name', e.target.value); }} /> diff --git a/web/src/OrganizationListPage.js b/web/src/OrganizationListPage.js index e907fc31..cc913891 100644 --- a/web/src/OrganizationListPage.js +++ b/web/src/OrganizationListPage.js @@ -210,8 +210,9 @@ class OrganizationListPage extends React.Component { this.deleteOrganization(index)} + disabled={record.name === "built-in"} > - + )