Procházet zdrojové kódy

fix: auth strategy dependent username label

NGPixel před 4 roky
rodič
revize
be499e5795

+ 6 - 0
client/components/editor/editor-ckeditor.vue

@@ -18,6 +18,7 @@
 import _ from 'lodash'
 import _ from 'lodash'
 import { get, sync } from 'vuex-pathify'
 import { get, sync } from 'vuex-pathify'
 import DecoupledEditor from '@requarks/ckeditor5'
 import DecoupledEditor from '@requarks/ckeditor5'
+// import DecoupledEditor from '../../../../wiki-ckeditor5/build/ckeditor'
 import EditorConflict from './ckeditor/conflict.vue'
 import EditorConflict from './ckeditor/conflict.vue'
 import { html as beautify } from 'js-beautify/js/lib/beautifier.min.js'
 import { html as beautify } from 'js-beautify/js/lib/beautifier.min.js'
 
 
@@ -110,6 +111,11 @@ export default {
             linkIsDownloadable: true
             linkIsDownloadable: true
           })
           })
           break
           break
+        case 'DIAGRAM':
+          this.editor.execute('imageInsert', {
+            source: `data:image/svg+xml;base64,${opts.text}`
+          })
+          break
       }
       }
     })
     })
 
 

+ 2 - 1
client/components/login.vue

@@ -40,7 +40,7 @@
               hide-details
               hide-details
               ref='iptEmail'
               ref='iptEmail'
               v-model='username'
               v-model='username'
-              :placeholder='$t("auth:fields.emailUser")'
+              :placeholder='$t(selectedStrategy.strategy.usernameLabel)'
               )
               )
             v-text-field.mt-2(
             v-text-field.mt-2(
               solo
               solo
@@ -536,6 +536,7 @@ export default {
                 color
                 color
                 icon
                 icon
                 useForm
                 useForm
+                usernameLabel
               }
               }
               displayName
               displayName
               order
               order

+ 1 - 0
server/graph/schemas/authentication.graphql

@@ -85,6 +85,7 @@ type AuthenticationStrategy {
   description: String
   description: String
   isAvailable: Boolean
   isAvailable: Boolean
   useForm: Boolean!
   useForm: Boolean!
+  usernameLabel: String
   logo: String
   logo: String
   color: String
   color: String
   website: String
   website: String

+ 1 - 0
server/modules/authentication/ldap/definition.yml

@@ -7,6 +7,7 @@ color: blue darken-3
 website: https://www.microsoft.com/windowsserver
 website: https://www.microsoft.com/windowsserver
 isAvailable: true
 isAvailable: true
 useForm: true
 useForm: true
+usernameLabel: 'auth:fields.username'
 props:
 props:
   url:
   url:
     title: LDAP URL
     title: LDAP URL

+ 1 - 0
server/modules/authentication/local/definition.yml

@@ -7,4 +7,5 @@ color: primary
 website: https://wiki.js.org
 website: https://wiki.js.org
 isAvailable: true
 isAvailable: true
 useForm: true
 useForm: true
+usernameLabel: 'auth:fields.email'
 props: {}
 props: {}