Author: olamy
Date: Wed Sep 5 17:03:43 2012
New Revision: 1381248
URL: http://svn.apache.org/viewvc?rev=1381248&view=rev
Log:
fix groupId deletion message
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1381248&r1=1381247&r2=1381248&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Wed Sep 5 17:03:43 2012
@@ -270,6 +270,7 @@ artifact.delete.confirm.title=Artifact d
artifact.delete.confirm.save=Are you sure to delete this artifact ?
groupId.delete.confirm.title=GroupId deletion
groupId.delete.confirm.save=Are you sure to delete groupId: {0} ?
+groupdId.deleted=groupId {0} deleted.
groupId.delete.missing.repoId= You must select a repository to delete a
groupId.
browse.artifact.version=Version
browse.artifact.pom.snippet=POM Snippet
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1381248&r1=1381247&r2=1381248&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Wed Sep 5 17:03:43 2012
@@ -86,6 +86,8 @@ define("archiva.search",["jquery","i18n"
}
deleteGroupId=function(groupId){
+ var previousHash=getUrlHash();
+ $.log("previousHash:"+previousHash);
var repoId=getSelectedBrowsingRepository();
if(!repoId){
displayErrorMessage($.i18n.prop('groupId.delete.missing.repoId'));
@@ -97,8 +99,8 @@ define("archiva.search",["jquery","i18n"
type:"GET",
dataType:"json",
success:function(data){
-
-
+ window.sammyArchivaApplication.setLocation(previousHash);
+ displaySuccessMessage( $.i18n.prop("groupdId.deleted", groupId));
},
error:function(data){
displayRestError(data,"user-messages");
@@ -110,7 +112,7 @@ define("archiva.search",["jquery","i18n"
}, $.i18n.prop('ok'),
$.i18n.prop('cancel'),
$.i18n.prop('groupId.delete.confirm.title'),
- $.i18n.prop('groupId.delete.confirm.save'));
+ $.i18n.prop('groupId.delete.confirm.save',groupId));
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1381248&r1=1381247&r2=1381248&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Wed Sep 5 17:03:43 2012
@@ -109,6 +109,11 @@ require(["jquery","jquery.tmpl","i18n"],
$(textId).focus();
}
+ getUrlHash=function(){
+ var matches = window.location.toString().match(/^[^#]*(#.+)$/);
+ return matches ? matches[1] : null;
+ }
+
/**
* clear #main-content and call clearUserMessages
*/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1381248&r1=1381247&r2=1381248&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Wed Sep 5 17:03:43 2012
@@ -50,9 +50,16 @@
{{/if}}
{{each(i,browseResultEntry) browseResultEntries}}
{{if browseResultEntry.project}}
- <li class="browse-list-project"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">
- <a href="#">${displayEntry(browseResultEntry.name)}</a>
- </li>
+ {{if deleteKarma}}
+ <li class="browse-list-project">
+ <img src="images/trash.png"
data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
+ <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{else}}
+ <li class="browse-list-project">
+ <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{/if}}
{{else}}
{{if deleteKarma}}
<li class="browse-list">
