Fix feedback for sharing errors

diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index 79ebf9187b9c727c723f479b71c8e8b24f1f20bb..4478144e92f3df9b1005302f5324a3a4c578823c 100755 (executable)
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -22,12 +22,12 @@ foreach ($sources as $source) {
                                OCP\JSON::success();
                        }
                } catch (Exception $exception) {
-                       OCP\Util::writeLog('files_sharing', 'Unexpected Error : '.$exception->getMessage(),OCP\Util::ERROR);
-                       OCP\JSON::error();
+                       OCP\Util::writeLog('files_sharing', 'Unexpected Error : '.$exception->getMessage(), OCP\Util::ERROR);
+                       OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
                }
        } else {
-               OCP\Util::writeLog('files_sharing', 'File does not exist or is not readable :'.$source,OCP\Util::ERROR);
-               OCP\JSON::error();
+               OCP\Util::writeLog('files_sharing', 'File does not exist or is not readable :'.$source, OCP\Util::ERROR);
+               OCP\JSON::error(array('data' => array('message' => 'File does not exist or is not readable')));
        }
 }
 

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index e9b46873d3a6f8b240cf6d34970551a7858c3b73..7bfaa1f0c69e0ead47f71bf3f723a83c143668c5 100644 (file)
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -35,7 +35,7 @@ OC.Share={
                                        callback(result.data);
                                }
                        } else {
-                               OC.dialogs.alert('Error', 'Error while sharing');
+                               OC.dialogs.alert(result.data.message, 'Error while sharing');
                        }
                });
        },