Author: olamy
Date: Mon Oct 15 14:10:40 2012
New Revision: 1398298
URL: http://svn.apache.org/viewvc?rev=1398298&view=rev
Log:
use loading button feature while saving remote repository
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1398298&r1=1398297&r2=1398298&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Mon Oct 15 14:10:40 2012
@@ -785,6 +785,8 @@ define("archiva.repositories",["jquery",
return;
}
clearUserMessages();
+ $("#user-messages").html(mediumSpinnerImg());
+ $("#remote-repository-save-button" ).button('loading');
if (update){
$.ajax("restServices/archivaServices/remoteRepositoriesService/updateRemoteRepository",
{
@@ -800,6 +802,10 @@ define("archiva.repositories",["jquery",
error: function(data) {
var res = $.parseJSON(data.responseText);
displayRestError(res);
+ },
+ complete: function(){
+ $("#remote-repository-save-button" ).button('reset');
+ removeMediumSpinnerImg("#user-messages");
}
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1398298&r1=1398297&r2=1398298&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Mon Oct 15 14:10:40 2012
@@ -627,7 +627,7 @@
</div>
</fieldset>
- <button data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
+ <button data-bind="click: save"
data-loading-text="${$.i18n.prop('common.loading')}"
id="remote-repository-save-button" class="btn">${$.i18n.prop('save')}</button>
<button data-bind="click: displayGrid"
class="btn">${$.i18n.prop('cancel')}</button>
</form>
</script>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java?rev=1398298&r1=1398297&r2=1398298&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
Mon Oct 15 14:10:40 2012
@@ -38,6 +38,7 @@ import org.apache.archiva.repository.Rep
import org.apache.archiva.repository.content.LegacyPathParser;
import org.apache.archiva.repository.content.ManagedDefaultRepositoryContent;
import org.apache.archiva.repository.content.RepositoryRequest;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResourceLocator;
@@ -57,7 +58,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* ArchivaDavResourceFactoryTest
