Sharing: Pre-check pw/expiry if the server requires it

Since the check boxes are disabled users can't check them themselves. For #7246
owncloud · Jun 17, 2019 · 9a02d51 · 9a02d51
1 parent 7d84208
commit 9a02d51
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
@@ -187,6 +187,11 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
     };
     retainSizeWhenHidden(_ui->pushButton_setPassword);
     retainSizeWhenHidden(_ui->create);
+
+    // If this starts out empty the first call to slotShareSelectionChanged()
+    // will not properly initialize the ui state if "Create new..." is the
+    // only option. So pre-fill with an invalid share id.
+    _selectedShareId = QStringLiteral("!&no-share-selected");
 }
 
 ShareLinkWidget::~ShareLinkWidget()
@@ -341,6 +346,10 @@ void ShareLinkWidget::slotShareSelectionChanged()
             _ui->checkBox_password->setChecked(true);
             _ui->lineEdit_password->setPlaceholderText("********");
             _ui->lineEdit_password->setEnabled(true);
+        } else if (createNew && _passwordRequired) {
+            _ui->checkBox_password->setChecked(true);
+            _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password"));
+            _ui->lineEdit_password->setEnabled(true);
         } else {
             _ui->checkBox_password->setChecked(false);
             _ui->lineEdit_password->setPlaceholderText(QString());
@@ -356,6 +365,9 @@ void ShareLinkWidget::slotShareSelectionChanged()
         _ui->checkBox_expire->setChecked(true);
         _ui->calendar->setDate(share->getExpireDate());
         _ui->calendar->setEnabled(true);
+    } else if (createNew && _expiryRequired) {
+        _ui->checkBox_expire->setChecked(true);
+        _ui->calendar->setEnabled(true);
     } else {
         _ui->checkBox_expire->setChecked(false);
         _ui->calendar->setEnabled(false);