diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-06 19:06:24 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-06 19:06:24 -0400 |
| commit | 41179a1456f749ab4cdbe84aac91e45a65bb11ba (patch) | |
| tree | 49467f428e704d3612e9ff7e69032921f1316bff /apps | |
| parent | e0db22cc0741abaebe44e245f2da6ca1a34f7cac (diff) | |
| download | nextcloud-server-41179a1456f749ab4cdbe84aac91e45a65bb11ba.tar.gz nextcloud-server-41179a1456f749ab4cdbe84aac91e45a65bb11ba.zip | |
Fix feedback for sharing errors
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/files_sharing/ajax/share.php | 8 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php index 79ebf9187b9..4478144e92f 100755 --- 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 e9b46873d3a..7bfaa1f0c69 100644 --- 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'); } }); }, |