Fixed js error after upload.

Merged Enis Nuredini requested to merge js_error_after_upload_fix into develop

Merge request reports