commit 9ed36c53e0a573b7ed0f11f405a1f69bd19eaa34
author Paladox none <thomasmulhall410@yahoo.com> Tue Jul 12 17:09:01 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 12 17:09:01 2022 +0000
tree 61c61d2cd42e4efa5cc73f8fce4542356f5eb867
parent 28050bb7a5a3b6987c3d9ed4bacd828b2e3517d1
parent e46604d498e25d82d03ac54f6f5f9f1901ae4c12

Merge changes Ib2ed69b8,I8e8f9597,Ia6c44f0a into stable-3.6

* changes:
  gr-cla-view: remove old css that broke displaying claNewAgreement
  gr-cla-view: simplify getAgreementsUrl
  gr-cla-view: Remove computeHideAgreementTextbox from html

polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.ts

diff --git a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.ts b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.ts
index f429c22..c8c06c9 100644
--- a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.ts
+++ b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.ts
@@ -90,12 +90,6 @@
         #claNewAgreementsLabel {
           font-weight: var(--font-weight-bold);
         }
-        #claNewAgreement {
-          display: none;
-        }
-        #claNewAgreement.show {
-          display: block;
-        }
         .contributorAgreementButton {
           font-weight: var(--font-weight-bold);
         }
@@ -166,7 +160,7 @@
             Please review the agreement.</a
           >
         </div>
-        ${this.renderAgreementsTextBox()} ${this.computeHideAgreementTextbox()}
+        ${this.renderAgreementsTextBox()}
       </div>
     `;
   }
@@ -223,14 +217,12 @@
   // private but used in test
   getAgreementsUrl(configUrl: string) {
     if (!configUrl) return '';
-    let url;
+
     if (configUrl.startsWith('http:') || configUrl.startsWith('https:')) {
-      url = configUrl;
-    } else {
-      url = getBaseUrl() + '/' + configUrl;
+      return configUrl;
     }
 
-    return url;
+    return `${getBaseUrl()}/${configUrl}`;
   }
 
   private readonly handleShowAgreement = (e: Event) => {