[Pkg-owncloud-commits] [owncloud-client] 102/171: Sharing: Display the error from the server when trying to share with users or group

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 1ed02f64945e4692d62b5474a5635258f4aac8c0
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jan 12 13:19:33 2016 +0100

    Sharing: Display the error from the server when trying to share with users or group
---
 src/gui/sharelinkwidget.cpp      |  9 ++-------
 src/gui/sharelinkwidget.h        |  1 -
 src/gui/shareusergroupwidget.cpp |  9 +++++++++
 src/gui/shareusergroupwidget.h   |  1 +
 src/gui/shareusergroupwidget.ui  | 12 +++++++++++-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 39df466..a8a3e2d 100644
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -505,8 +505,8 @@ void ShareLinkWidget::setShareCheckBoxTitle(bool haveShares)
 void ShareLinkWidget::displayError(int code, const QString &message)
 {
     const QString arg = QString("%1, %2").arg(code).arg(message);
-    const QString errMsg = tr("OCS API error code: %1").arg(arg);
-    displayError(errMsg);
+    qDebug() << "Error from server" << code << message;
+    displayError(message);
 }
 
 void ShareLinkWidget::displayError(const QString& errMsg)
@@ -515,10 +515,5 @@ void ShareLinkWidget::displayError(const QString& errMsg)
     _ui->errorLabel->show();
 }
 
-void ShareLinkWidget::displayError(int code)
-{
-    const QString errMsg = tr("OCS API error code: %1").arg(code);
-    displayError(errMsg);
-}
 
 }
diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h
index 3f0cd54..6ca2dde 100644
--- a/src/gui/sharelinkwidget.h
+++ b/src/gui/sharelinkwidget.h
@@ -74,7 +74,6 @@ private slots:
 
 private:
     void setShareCheckBoxTitle(bool haveShares);
-    void displayError(int code);
     void displayError(const QString& errMsg);
     void setShareLink( const QString& url );
     void resizeEvent(QResizeEvent *e);
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 313c0b3..898242e 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -74,6 +74,7 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account, const QString &sh
     _manager = new ShareManager(_account, this);
     connect(_manager, SIGNAL(sharesFetched(QList<QSharedPointer<Share>>)), SLOT(slotSharesFetched(QList<QSharedPointer<Share>>)));
     connect(_manager, SIGNAL(shareCreated(QSharedPointer<Share>)), SLOT(getShares()));
+    connect(_manager, SIGNAL(serverError(int,QString)), this, SLOT(displayError(int,QString)));
     connect(_ui->shareeLineEdit, SIGNAL(returnPressed()), SLOT(slotLineEditReturn()));
 
     // By making the next two QueuedConnections we can override
@@ -91,6 +92,7 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account, const QString &sh
     _completionTimer.setInterval(600);
 
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
+    _ui->errorLabel->hide();
 }
 
 ShareUserGroupWidget::~ShareUserGroupWidget()
@@ -230,6 +232,13 @@ void ShareUserGroupWidget::slotCompleterHighlighted(const QModelIndex & index)
     _ui->shareeLineEdit->setText(index.data(Qt::DisplayRole).toString());
 }
 
+void ShareUserGroupWidget::displayError(int code, const QString& message)
+{
+    qDebug() << "Error from server" << code << message;
+    _ui->errorLabel->setText(message);
+    _ui->errorLabel->show();
+}
+
 ShareWidget::ShareWidget(QSharedPointer<Share> share,
                          bool isFile,
                          QWidget *parent) :
diff --git a/src/gui/shareusergroupwidget.h b/src/gui/shareusergroupwidget.h
index 0b821b7..0c827d6 100644
--- a/src/gui/shareusergroupwidget.h
+++ b/src/gui/shareusergroupwidget.h
@@ -109,6 +109,7 @@ private slots:
     void slotCompleterHighlighted(const QModelIndex & index);
     void slotShareesReady();
     void slotAdjustScrollWidgetSize();
+    void displayError(int code ,const QString &message);
 
 private:
     Ui::ShareUserGroupWidget *_ui;
diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index 0249265..0fb4d62 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -41,13 +41,23 @@
         <x>0</x>
         <y>0</y>
         <width>441</width>
-        <height>128</height>
+        <height>98</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3"/>
      </widget>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="errorLabel">
+     <property name="text">
+      <string notr="true">Placeholder for Error text</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git