merge commit

This commit is contained in:
robvde 2012-10-26 12:13:16 +04:00
commit 5f68011de2
6 changed files with 103 additions and 76 deletions

View file

@ -4631,6 +4631,9 @@
<data name="Error.GALLERY_APP_DOWNLOAD_FAILED" xml:space="preserve">
<value>We apologize for the inconvenience but the application download has been failed. Please contact your service provider to correct the issue.</value>
</data>
<data name="Error.GALLERY_APP_UNAUTHORIZEDACCESSEXCEPTION" xml:space="preserve">
<value>We apologize for the inconvenience but the application download has been failed. Access is denied. Check WebSitePanel event log.</value>
</data>
<data name="Error.WAG_NOT_AVAILABLE" xml:space="preserve">
<value>Web Application Gallery module is unavailable:</value>
</data>

View file

@ -100,6 +100,12 @@ namespace WebsitePanel.Portal
ShowErrorMessage("GALLERY_APP_DOWNLOAD_FAILED");
isSuccess = false;
break;
case GalleryWebAppStatus.UnauthorizedAccessException:
ShowErrorMessage("GALLERY_APP_UNAUTHORIZEDACCESSEXCEPTION");
isSuccess = false;
break;
}
}
catch(Exception ex)