浏览代码

finalize new subdomain page, various fixes

Olivier Massot 3 年之前
父节点
当前提交
61c860a13c

+ 0 - 1
components/Form/Parameters/Subdomains.vue

@@ -70,7 +70,6 @@ export default defineComponent({
     const repository: VuexRepository<Model> = repositoryHelper.getRepository(Subdomain)
     const query: ComputedRef<Query> = computed(() => repository.query())
     const subdomains: ComputedRef<Collection> = computed(() => queryHelper.getCollection(query.value))
-
     const goToEditPage = function(id: number) {
       router.push('/parameters/subdomain/' + id)
     }

+ 1 - 1
lang/content/parameters/fr-FR.js

@@ -14,6 +14,6 @@ export default (context, locale) => {
     this_subdomain_is_available: 'Ce sous-domaine est disponible',
     subdomain_can_not_contain_spaces_or_special_cars: 'Le sous-domaine ne doit pas contenir d\'espaces ni de caractères spéciaux',
     please_enter_a_value_for_the_subdomain: 'Veuillez saisir une valeur pour le sous-domaine',
-    please_wait_for_validation: 'Veuillez patienter, validation en cours',
+    validation_ongoing: 'Validation en cours',
   })
 }

+ 1 - 1
layouts/error.vue

@@ -19,7 +19,7 @@ export default defineComponent({
   setup (props) {
     const {$config} = useContext()
     const baseLegacyUrl:string = $config.baseURL_adminLegacy
-    if(process.client && props.error.statusCode === 404)
+    if(process.client && props.error.statusCode === 404 && process.env.NODE_ENV === 'production')
       window.location.href= `${baseLegacyUrl}/dashboard`
 
     return {

+ 0 - 7
models/Organization/Parameters.ts

@@ -1,5 +1,4 @@
 import {Str, Model, Uid, Bool, Num, Attr, HasOne} from '@vuex-orm/core'
-import {Subdomain} from "~/models/Organization/Subdomain";
 
 export class Parameters extends Model {
   static entity = 'parameters'
@@ -34,12 +33,6 @@ export class Parameters extends Model {
   @Bool(true, { nullable: false })
   logoDonorsMove!: boolean
 
-  @Str(null, { nullable: true })
-  subDomain!: string|null
-
-  @Str(null, { nullable: true })
-  website!: string|null
-
   @Str(null, { nullable: true })
   otherWebsite!: string|null
 

+ 18 - 0
services/data/hooks/hookPersister/postPersistProfileRefresh.ts

@@ -0,0 +1,18 @@
+import { DataPersisterArgs, HookPersister } from '~/types/interfaces'
+import BaseHook from '~/services/data/hooks/baseHook'
+import {Parameters} from "~/models/Organization/Parameters";
+import DataPersister from "~/services/data/dataPersister";
+
+class ParametersPostPersist extends BaseHook implements HookPersister {
+  public static  priority = 10
+
+  async invoke (_args: DataPersisterArgs): Promise<any> {
+    await (this.parent as DataPersister).fetchProfile()
+  }
+
+  static support (_args: DataPersisterArgs): boolean {
+    return (typeof _args.model !== 'undefined') && _args.model.entity === 'parameters'
+  }
+}
+
+export default ParametersPostPersist