Author: olamy
Date: Mon Mar 26 12:15:47 2012
New Revision: 1305327
URL: http://svn.apache.org/viewvc?rev=1305327&view=rev
Log:
take of karma for adding/deleting artifact custom properties
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/archiva/templates/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=1305327&r1=1305326&r2=1305327&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
Mon Mar 26 12:15:47 2012
@@ -321,6 +321,14 @@ $(function() {
}
+ hasSavePropertyKarma=function(){
+ return hasKarma("archiva-add-metadata");
+ }
+
+ hasDeletePropertyKarma=function(){
+ return hasKarma("archiva-delete-metadata");
+ }
+
saveProperty=function(entry){
if($.trim(entry.key() ).length<1){
clearUserMessages();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1305327&r1=1305326&r2=1305327&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Mon Mar 26 12:15:47 2012
@@ -687,7 +687,9 @@
</table>
<div id="artifactMetadata_Pagination"></div>
- <a href="#" class="btn btn-primary" data-bind="click:
addProperty">${$.i18n.prop('browse.artifact.metadatas.add')}</a>
+ {{if hasSavePropertyKarma()}}
+ <a href="#" class="btn btn-primary" data-bind="click:
addProperty">${$.i18n.prop('browse.artifact.metadatas.add')}</a>
+ {{/if}}
</div>
</div>
@@ -755,15 +757,25 @@
<tbody>
{{each(i, row) itemsOnCurrentPage()}}
<tr>
- {{if row.editable}}
+ {{if row.editable && hasSavePropertyKarma()}}
<td><input type="text" data-bind="value: row.key"/></td>
{{else}}
<td>${row.key}</td>
{{/if}}
- <td><input type="text" data-bind="value: row.value"/></td>
- <td><a href="#" class="btn btn-danger" data-bind="click:
function(){deleteProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.delete')}</a></td>
<td>
- {{if row.modified}}
+ {{if hasSavePropertyKarma()}}
+ <input type="text" data-bind="value: row.value"/>
+ {{else}}
+ ${row.value}
+ {{/if}}
+ </td>
+ <td>
+ {{if hasDeletePropertyKarma()}}
+ <a href="#" class="btn btn-danger" data-bind="click:
function(){deleteProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.delete')}</a>
+ {{/if}}
+ </td>
+ <td>
+ {{if row.modified && hasSavePropertyKarma()}}
<a href="#" class="btn btn-warning" data-bind="click:
function(){saveProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.save')}</a>
{{/if}}
</td>
