tried to fix issue in adding default apps

factly · Sep 5, 2022 · d1ef1b7 · d1ef1b7
1 parent 946a98d
commit d1ef1b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/server/action/organisation/application/addDefault.go b/server/action/organisation/application/addDefault.go
@@ -99,7 +99,8 @@ func addDefault(w http.ResponseWriter, r *http.Request) {
 		errorx.Render(w, errorx.Parser(errorx.DBError()))
 		return
 	}
-	newOrganisations := append(app.Organisations, *org)
+	newOrganisations := make([]model.Organisation, 0)
+	newOrganisations = append(app.Organisations, *org)
 	err = tx.Model(&app).Association("Organisations").Replace(&newOrganisations)
 	if err != nil {
 		tx.Rollback()

diff --git a/web/src/pages/application/components/ApplicationType.js b/web/src/pages/application/components/ApplicationType.js
@@ -21,7 +21,7 @@ export const ApplicationType = () => {
             <SettingsCard
               icon={<CloudDownloadOutlined style={{ color: '#4E89FF' }} />}
               title="Default Applications"
-              description="In this section you can add applications to your organisation which are managed by the admin."
+              description="In this section you can add and delete applications to your organisation which are managed by the admin."
             />
           </Link>
         </Col>

diff --git a/web/src/pages/application/index.js b/web/src/pages/application/index.js
@@ -37,7 +37,7 @@ function Application() {
             <Skeleton />
           ) : (
             <Link key="1" to="/applications/type">
-              <Button type="primary">New Application</Button>
+              <Button type="primary">Manage Application</Button>
             </Link>
           )
         ) : null}