correct account spacing when updating published content (fixes #1637)

rstudio · Nov 16, 2017 · 4173df7 · 4173df7
1 parent 1fe4042
commit 4173df7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/rsconnect/ui/RSConnectDeploy.java b/src/gwt/src/org/rstudio/studio/client/rsconnect/ui/RSConnectDeploy.java
@@ -632,7 +632,7 @@ private RSConnectAccount getSelectedAccount()
    {
       if (accountList_.isVisible())
          return accountList_.getSelectedAccount();
-      else if (accountEntry_.isVisible())
+      else if (accountEntryPanel_.isVisible())
          return accountEntry_.getAccount();
       else
          return null;
@@ -720,7 +720,7 @@ public void onError(ServerError error)
    private void setSingleAccount(RSConnectAccount account)
    {
       accountEntry_.setAccount(account);
-      accountEntry_.setVisible(true);
+      accountEntryPanel_.setVisible(true);
    }
 
    private void populateAccountList(final ProgressIndicator indicator,
@@ -770,7 +770,7 @@ private void populateAccountList(final ProgressIndicator indicator,
 
       // populate the accounts in the UI (the account display widget filters
       // based on account criteria)
-      accountEntry_.setVisible(false);
+      accountEntryPanel_.setVisible(false);
       publishToLabel_.setVisible(false);
       int numAccounts = setAccountList(accounts);
 
@@ -1257,6 +1257,7 @@ private void showAppError(String error)
    @UiField HTMLPanel newAppPanel_;
    @UiField HTMLPanel rootPanel_;
    @UiField HTMLPanel appErrorPanel_;
+   @UiField HTMLPanel accountEntryPanel_;
    @UiField Image deployIllustration_;
    @UiField Image descriptionImage_;
    @UiField InlineLabel deployLabel_;

diff --git a/src/gwt/src/org/rstudio/studio/client/rsconnect/ui/RSConnectDeploy.ui.xml b/src/gwt/src/org/rstudio/studio/client/rsconnect/ui/RSConnectDeploy.ui.xml
@@ -59,9 +59,10 @@
                   text="Publish To Account:"
                   ui:field="publishToLabel_">
          </g:Label>
-         <rsc:RSConnectAccountEntry styleName="{res.style.accountEntry}"
-                                    ui:field="accountEntry_">
-         </rsc:RSConnectAccountEntry>
+         <g:HTMLPanel styleName="{res.style.accountEntry}" ui:field="accountEntryPanel_">
+            <rsc:RSConnectAccountEntry ui:field="accountEntry_">
+            </rsc:RSConnectAccountEntry>
+         </g:HTMLPanel>
          <g:HTMLPanel ui:field="newAppPanel_">
             <g:Label styleName="{res.style.controlLabel}" ui:field="nameLabel_" 
                      text="Title:"></g:Label>