Merge branch 'moqui:master' into master

mkdecisiondev · Nov 28, 2023 · 76c90dc · 76c90dc
2 parents a7c9e9e + 6789f99
commit 76c90dc
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 40 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -54,6 +54,7 @@ Written in 2019 by Arlen McDonell - jmcdl
 Written in 2019 by Jacob Barnes - Tellan
 Written in 2019 by Arzang Kasiri - akasiri
 Written in 2021 by Amir Anjomshoaa - amiranjom
+Written in 2023 by Newmann Hu - newmann
 
 ===========================================================================
 
@@ -94,5 +95,6 @@ Written in 2019 by Arlen McDonell - jmcdl
 Written in 2019 by Jacob Barnes - Tellan
 Written in 2019 by Arzang Kasiri - akasiri
 Written in 2021 by Amir Anjomshoaa - amiranjom
+Written in 2023 by Newmann Hu - newmann
 
 ===========================================================================
diff --git a/base-component/webroot/screen/webroot/Login.ftl b/base-component/webroot/screen/webroot/Login.ftl
@@ -20,6 +20,7 @@
 <div class="text-center form-signin">
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation"><a href="#login" aria-controls="login" role="tab" data-toggle="tab">${ec.l10n.localize("Login")}</a></li>
+        <#if authFlowList?has_content && !authFlowList.isEmpty()><li role="presentation"><a href="#sso" aria-controls="sso" role="tab" data-toggle="tab">${ec.l10n.localize("SSO")}</a></li></#if>
         <li role="presentation"><a href="#reset" aria-controls="reset" role="tab" data-toggle="tab">${ec.l10n.localize("Reset Password")}</a></li>
         <li role="presentation"><a href="#change" aria-controls="change" role="tab" data-toggle="tab">${ec.l10n.localize("Change Password")}</a></li>
     </ul>
@@ -57,6 +58,16 @@
             <#if passwordChangeRequired><p class="text-warning text-center">WARNING: Password change required</p></#if>
         </form>
     </div>
+    <#if authFlowList?has_content && !authFlowList.isEmpty()>
+        <div id="sso" class="tab-pane">
+            <#list authFlowList as authFlow>
+                <form method="post" action="/sso/login" class="form-signin">
+                    <input type="hidden" name="authFlowId" value="${authFlow.authFlowId}">
+                    <button class="btn btn-lg btn-primary btn-block" type="submit">${authFlow.description}</button>
+                </form>
+            </#list>
+        </div>
+    </#if>
     <div id="reset" class="tab-pane">
         <form method="post" action="${sri.buildUrl("resetPassword").url}" class="form-signin" id="reset_form">
             <p class="text-muted text-center">${ec.l10n.localize("Enter your username to email a reset password")}</p>

diff --git a/base-component/webroot/screen/webroot/css/webroot-layout.css b/base-component/webroot/screen/webroot/css/webroot-layout.css
@@ -213,7 +213,7 @@ a.jstree-anchor { white-space: normal; }
 
 .ScreenTreeNested { margin: 4px 0 4px 12px; padding: 0 0 0 12px; border-left: 1px dashed lightgrey; }
 
-.Login .form-signin { display: block; width: 340px; padding: 10px; margin: 0 auto; border-radius: 3px; }
+.Login .form-signin { display: block; width: 380px; padding: 10px; margin: 0 auto; border-radius: 3px; }
 .Login .form-signin input { width: 100%; height: auto; font-size: 1.2em; }
 .Login .form-signin input.top { margin-bottom: -1px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
 .Login .form-signin input.middle { margin-bottom: -1px; border-radius: 0; }

diff --git a/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js b/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js
@@ -367,8 +367,11 @@ Vue.component('m-container-box', {
             '<slot name="header"></slot>' +
             '<q-space></q-space>' +
             '<slot name="toolbar"></slot>' +
+            '  <q-btn color="grey"  round flat dense :icon="isBodyOpen ? \'keyboard_arrow_up\' : \'keyboard_arrow_down\'" @click="toggleBody" />' +            
         '</q-card-actions>' +
+        '  <div v-show="isBodyOpen">' +
         '<q-card-section :class="{in:isBodyOpen}"><slot></slot></q-card-section>' +
+                        '  </div>' +
     '</q-card>',
     methods: { toggleBody: function() { this.isBodyOpen = !this.isBodyOpen; } }
 });
@@ -1138,8 +1141,13 @@ Vue.component('m-form-column-config', {
         generalFormFields: function() {
             var fields = this.$refs.mForm.fields;
             fields.formLocation = this.formLocation;
-            if (this.findParameters) for (var curKey in Object.keys(this.findParameters))
-                fields[curKey] = this.findParameters[curKey];
+            if (this.findParameters) {
+                var findParmKeys = Object.keys(this.findParameters);
+                for (var keyIdx = 0; keyIdx < findParmKeys.length; keyIdx++) {
+                    var curKey = findParmKeys[keyIdx];
+                    fields[curKey] = this.findParameters[curKey];
+                }
+            }
             console.log("Save column config " + this.formLocation + " Window Width " + window.innerWidth + " Quasar Platform: " + JSON.stringify(Quasar.Platform.is));
             if (window.innerWidth <= 600 || Quasar.Platform.is.mobile) fields._uiType = 'mobile';
         }