From: Olivier Lamy Date: Wed, 28 Mar 2012 11:17:16 +0000 (+0000) Subject: [MRM-1586] rewrite upload artifact page X-Git-Tag: archiva-1.4-M3~918 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6a966f9580d7ce6eb073523bb204dc3d7213690d;p=archiva.git [MRM-1586] rewrite upload artifact page cleanup ui. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1306259 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java index 5a717431c..a5ae89191 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java @@ -18,8 +18,8 @@ package org.apache.archiva.webapp.ui.services.model; * under the License. */ -import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; /** * @author Olivier Lamy @@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement( name = "fileMetadata" ) public class FileMetadata + implements Serializable { private String name; @@ -82,7 +83,6 @@ public class FileMetadata this.url = url; } - @XmlElement( name = "delete_url" ) public String getDeleteUrl() { return deleteUrl; @@ -94,7 +94,6 @@ public class FileMetadata this.deleteUrl = deleteUrl; } - @XmlElement( name = "delete_type" ) public String getDeleteType() { return deleteType; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif new file mode 100644 index 000000000..90f28cbdb Binary files /dev/null and b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif differ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif new file mode 100644 index 000000000..fbcce6bc9 Binary files /dev/null and b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif differ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html index 4c84c4fe9..08b495b01 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html @@ -1,6 +1,7 @@ + diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js index f4ee6c57d..c2c48a8aa 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js @@ -134,9 +134,10 @@ template, preview; if (data.context) { - data.context.each(function (index) { + + data.context.each(function (index, e) { var file = ($.isArray(data.result) && - data.result[index]) || {error: 'emptyResult'}; + data.result[index]) || data.result || {error: 'emptyResult'}; if (file.error) { that._adjustMaxNumberOfFiles(1); } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html index 1063fa2e8..bc0bc816f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html @@ -1,101 +1,101 @@ - - - \ No newline at end of file