yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add server error to html

Browse Source
This commit is contained in:
Mads Rasmussen
2015-11-25 19:16:14 +01:00
parent dbbccb4e40
commit 89fd42be25
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
View File

@@ -179,17 +179,16 @@ angular.module("umbraco.directives")
file.uploadStatus = "error";
//if the service returns a detailed error
if(evt.InnerException){
file.serverErrorMessage = evt.InnerException.ExceptionMessage;
if (evt.InnerException) {
file.serverErrorMessage = evt.InnerException.ExceptionMessage;
//Check if its the common "too large file" exception
if(evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0){
file.serverErrorMessage = "File too large to upload";
}
}
//Check if its the common "too large file" exception
if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
file.serverErrorMessage = "File too large to upload";
}
if(evt.Message) {
file.serverErrorMessage = evt.Message;
} else if (evt.Message) {
file.serverErrorMessage = evt.Message;
}
// If file not found, server will return a 404 and display this message

6
src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
View File

@@ -79,7 +79,11 @@
<span class="file-error" ng-if="file.$error">
<span ng-if="file.$error === 'pattern'" class="errorMessage color-red">(Only allowed file types are: "{{ accept }}")</span>
<span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(Max file size is " {{ maxFileSize }} ")</span>
<span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(Max file size is "{{maxFileSize}}")</span>
</span>
<span class="file-error" ng-if="file.serverErrorMessage">
<span class="errorMessage color-red">({{file.serverErrorMessage}})</span>
</span>
</div>