luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix upload page

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2019-11-16 17:48:51 +01:00
parent 65f084193e
commit c602ce82b8
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/pages/library/upload.vue
View file

@ -30,6 +30,8 @@
<script>
import Event from "pubsub-js";
import Api from "common/api";
import Alert from "common/alert";
export default {
name: 'p-tab-upload',
@ -66,7 +68,7 @@
return
}
this.$alert.info("Uploading photos...");
Alert.info("Uploading photos...");
Event.publish("ajax.start");
@ -79,7 +81,7 @@
formData.append('files', file);
await this.$api.post('upload/' + ctx.started,
await Api.post('upload/' + ctx.started,
formData,
{
headers: {
@ -89,7 +91,7 @@
).then(function () {
ctx.completed = Math.round((ctx.current / ctx.total) * 100);
}).catch(function () {
this.$alert.error("Upload failed");
Alert.error("Upload failed");
});
}
}
@ -98,12 +100,12 @@
this.indexing = true;
const ctx = this;
this.$api.post('import/upload/' + this.started).then(function () {
this.$alert.success("Upload complete");
Api.post('import/upload/' + this.started).then(function () {
Alert.success("Upload complete");
ctx.busy = false;
ctx.indexing = false;
}).catch(function () {
this.$alert.error("Failure while importing uploaded files");
Alert.error("Failure while importing uploaded files");
ctx.busy = false;
ctx.indexing = false;
});

4
internal/api/import.go
View file

@ -56,9 +56,9 @@ func Import(router *gin.RouterGroup, conf *config.Config) {
elapsed := int(time.Since(start).Seconds())
event.Success(fmt.Sprintf("completed import in %d s", elapsed))
event.Success(fmt.Sprintf("import completed in %d s", elapsed))
event.Publish("import.completed", event.Data{"path": path, "seconds": elapsed})
c.JSON(http.StatusOK, gin.H{"message": fmt.Sprintf("completed import in %d s", elapsed)})
c.JSON(http.StatusOK, gin.H{"message": fmt.Sprintf("import completed in %d s", elapsed)})
})
}