Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamila San <hello@camila.codes>2018-08-19 13:43:12 +0300
committerCamila San <hello@camila.codes>2018-08-21 23:48:50 +0300
commitcf3ee4b3a45a5b37e5a95d89e4fa158675101bff (patch)
tree7bb2f386b9bcbc5a0d83027473d4d239bbe84905 /src/gui/sharelinkwidget.cpp
parent8f7bc8cff9c8da38e4d3a0c0fb0545496cacb5d0 (diff)
Fixes share link delete action when clicking on tool button menu.
- Shared point was not handled properly. Signed-off-by: Camila San <hello@camila.codes>
Diffstat (limited to 'src/gui/sharelinkwidget.cpp')
-rw-r--r--src/gui/sharelinkwidget.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index afd8692fe..ae0d50e54 100644
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -75,7 +75,7 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
// _ui->verticalLayout->addWidget(_pi_password, Qt::AlignCenter);
// _ui->verticalLayout->addWidget(_pi_editing, Qt::AlignCenter);
- connect(_ui->enableShareLink, &QCheckBox::toggled, this, &ShareLinkWidget::slotCreateorDeleteShareLink);
+ connect(_ui->enableShareLink, &QCheckBox::toggled, this, &ShareLinkWidget::slotCreateOrDeleteShareLink);
connect(_ui->lineEdit_password, &QLineEdit::returnPressed, this, &ShareLinkWidget::slotCreatePassword);
connect(_ui->confirmPassword, &QAbstractButton::clicked, this, &ShareLinkWidget::slotCreatePassword);
connect(_ui->confirmExpirationDate, &QAbstractButton::clicked, this, &ShareLinkWidget::slotCreatePassword);
@@ -354,7 +354,7 @@ void ShareLinkWidget::slotCreatePassword()
}
}
-void ShareLinkWidget::slotCreateorDeleteShareLink(bool checked)
+void ShareLinkWidget::slotCreateOrDeleteShareLink(bool checked)
{
if (!_manager) {
qCWarning(lcSharing) << "No share manager set.";
@@ -371,8 +371,6 @@ void ShareLinkWidget::slotCreateorDeleteShareLink(bool checked)
}
confirmAndDeleteShare();
}
-
- _ui->shareLinkToolButton->setEnabled(checked);
}
void ShareLinkWidget::setPassword(const QString &password)
@@ -410,6 +408,9 @@ void ShareLinkWidget::slotPasswordSet()
void ShareLinkWidget::slotDeleteShareFetched()
{
+ _linkShare.clear();
+ _ui->enableShareLink->setChecked(false);
+ _ui->shareLinkToolButton->setEnabled(false);
getShares();
}
@@ -469,12 +470,8 @@ void ShareLinkWidget::confirmAndDeleteShare()
connect(messageBox, &QMessageBox::finished, this,
[messageBox, yesButton, this]() {
- if (messageBox->clickedButton() == yesButton){
- // TODO: dlete is not hapenning correctly
+ if (messageBox->clickedButton() == yesButton)
this->_linkShare->deleteShare();
- this->_ui->enableShareLink->setChecked(false);
- this->_ui->shareLinkToolButton->setEnabled(false);
- }
});
messageBox->open();
}
@@ -525,7 +522,7 @@ void ShareLinkWidget::slotLinkContextMenuActionTriggered(QAction *action)
toggleExpireDateOptions(state);
} else if (action == _unshareLinkAction) {
- confirmAndDeleteShare();
+ slotCreateOrDeleteShareLink(state);
}
}