Author: olamy
Date: Wed Sep 5 17:03:02 2012
New Revision: 1381246
URL: http://svn.apache.org/viewvc?rev=1381246&view=rev
Log:
deleting groupId tru the ui
Modified:
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/templates/archiva/search.html
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=1381246&r1=1381245&r2=1381246&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:02 2012
@@ -80,6 +80,38 @@ define("archiva.search",["jquery","i18n"
}
return value;
}
+
+ deleteKarma=function(){
+ return hasKarma('archiva-delete-artifact');
+ }
+
+ deleteGroupId=function(groupId){
+ var repoId=getSelectedBrowsingRepository();
+ if(!repoId){
+ displayErrorMessage($.i18n.prop('groupId.delete.missing.repoId'));
+ return;
+ }
+ openDialogConfirm(function(){
+ $.ajax({
+
url:"restServices/archivaServices/repositoriesService/deleteGroupId?groupId="+groupId+"&repositoryId="+repoId,
+ type:"GET",
+ dataType:"json",
+ success:function(data){
+
+
+ },
+ error:function(data){
+ displayRestError(data,"user-messages");
+ },
+ complete:function(){
+ closeDialogConfirm();
+ }
+ });
+ }, $.i18n.prop('ok'),
+ $.i18n.prop('cancel'),
+ $.i18n.prop('groupId.delete.confirm.title'),
+ $.i18n.prop('groupId.delete.confirm.save'));
+ }
}
calculateBreadCrumbEntries=function(groupId){
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=1381246&r1=1381245&r2=1381246&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:02 2012
@@ -52,11 +52,20 @@
{{if browseResultEntry.project}}
<li class="browse-list-project"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">
<a href="#">${displayEntry(browseResultEntry.name)}</a>
+ </li>
{{else}}
- <li class="browse-list"
data-bind="click:function(){displayGroupId(browseResultEntry.name)}">
- <a href="#" title="folder
${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ {{if deleteKarma}}
+ <li class="browse-list">
+ <img src="images/trash.png"
data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
+ <a
data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
title="folder
${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{else}}
+ <li class="browse-list" >
+ <a href="#" title="folder
${displayEntry(browseResultEntry.name)}"
data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{/if}}
{{/if}}
- </li>
+
{{/each}}
</ul>
</div>
