PHOTARK-11 - simple upload page that create new albums and upload images in one step
git-svn-id: https://svn.apache.org/repos/asf/incubator/photark/trunk@911261 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/photark-ui-admin/src/main/webapp/admin/upload.html b/photark-ui-admin/src/main/webapp/admin/upload.html
index 33fed5e..8e09e44 100644
--- a/photark-ui-admin/src/main/webapp/admin/upload.html
+++ b/photark-ui-admin/src/main/webapp/admin/upload.html
@@ -84,22 +84,11 @@
selectAlbum.options.length=0;
selectAlbum.options[selectAlbum.options.length] = new Option("New Album", "New Album", true, false);
for(var pos = 0; pos<albums.length; pos++) {
- selectAlbum.options[selectAlbum.options.length] = new Option(albums[pos], albums[pos], false, false);
+ selectAlbum.options[selectAlbum.options.length] = new Option(albums[pos].name, albums[pos].name, false, false);
}
});
}
-
- function doUpload() {
- console.log("doUpload");
- var selected = dojo.byId("selectAlbum").value;
- if(selected == null || (selected != null && selected == "" && selected.length == 0)) {
- alert("Photo Upload can not be started.Select Album before upload");
- } else if(selected == "New Album") {
- uploader.upload(dojo.byId("newAlbumName").value);
- } else {
- uploader.upload({selectAlbum:selected});
- }
- }
+
</script>
</head>
diff --git a/photark-ui-admin/src/main/webapp/admin/upload.js b/photark-ui-admin/src/main/webapp/admin/upload.js
index 19002c8..051e092 100644
--- a/photark-ui-admin/src/main/webapp/admin/upload.js
+++ b/photark-ui-admin/src/main/webapp/admin/upload.js
@@ -60,6 +60,21 @@
deferredUploading:false
},fileUploaderConfig), "btnUploader");
+
+ doUpload = function(){
+ console.log("doUpload");
+ var selected = dojo.byId("selectAlbum").value;
+ console.log("selected:"+selected);
+ if(selected == null || (selected != null && selected == "" && selected.length == 0)) {
+ alert("Photo Upload can not be started.Select Album before upload");
+ } else if(selected == "New Album") {
+ uploader.upload({albumname:dojo.byId("newAlbumName").value});
+ } else {
+ uploader.upload({albumname:selected});
+ }
+ dojo.byId("newAlbumName").value ="";
+ }
+
/*
uploader.attr("disabled", dojo.byId("fGroup").value=="");
dojo.connect(dojo.byId("fGroup"), "keyup", function(){
