Merge branch 'develop' into fix-ogrn-two

mikhailprivalov · Oct 3, 2024 · 5c22806 · 5c22806
2 parents 0739f3f + 50e27c8
commit 5c22806
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/l2-frontend/src/pages/EDS.vue b/l2-frontend/src/pages/EDS.vue
@@ -583,7 +583,7 @@ export default class EDS extends Vue {
       if (this.filters.mode === 'my') {
         return snilsCert === this.snilsUser;
       }
-      return !!(certObj.ORGN || certObj['ОГРН']);
+      return !!(certObj.OGRN || certObj['ОГРН']);
     });
     if (filteredCertificates.length === 0) {
       this.selectedCertificate = null;

diff --git a/l2-frontend/src/utils.ts b/l2-frontend/src/utils.ts
@@ -376,10 +376,10 @@ export const convertSubjectNameToTitle = (object: any, subjectName: string | nul
 export const subjectNameHasOGRN = (object: any, subjectName: string | null) => {
   const obj = object || convertSubjectNameToCertObject(subjectName);
 
-  let ogrn = obj['ОГРН'] || null;
+  let ogrn = obj['ОГРН'] || obj.OGRN || null;
 
   if (!ogrn) {
-    ogrn = Object.entries(obj).find(([, v]) => v === 'ОГРН')?.[0] || null;
+    ogrn = Object.entries(obj).find(([, v]) => v === 'ОГРН' || v === 'OGRN')?.[0] || null;
   }
 
   return String(ogrn || '').length === 13;

diff --git a/laboratory/__init__.py b/laboratory/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "2024.10.30054+b56b73"
+__version__ = "2024.10.30643+d73e18"
 VERSION = __version__
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ skip-string-normalization = true
 
 [tool.poetry]
 name = "l2"
-version = "2024.10.30054+b56b73"
+version = "2024.10.30643+d73e18"
 description = ""
 authors = ["Mikhail Privalov <[email protected]>"]
 license = "MIT"