You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/10 18:24:24 UTC
svn commit: r1242864 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
proxy-connectors.js templates/proxy-connectors.html
Author: olamy
Date: Fri Feb 10 17:24:24 2012
New Revision: 1242864
URL: http://svn.apache.org/viewvc?rev=1242864&view=rev
Log:
[MRM-1576] rewrite proxies connector page
sourceRepoId and targetRepoId not editable on proxyConnector edition.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1242864&r1=1242863&r2=1242864&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Fri Feb 10 17:24:24 2012
@@ -127,6 +127,10 @@ $(function() {
this.update=update;
this.modified=ko.observable(false);
+ isUpdate=function(){
+ return self.update;
+ }
+
getSelectedPolicyOption=function(id){
$.log("getSelectedPolicyOption:"+id);
@@ -270,6 +274,7 @@ $(function() {
mainContent.find("#proxy-connectors-edit").html($("#proxy-connector-edit-form-tmpl").tmpl());
ko.applyBindings(proxyConnectorViewModel,mainContent.find("#proxy-connectors-edit").get(0));
activateProxyConnectorsEditTab();
+ mainContent.find("#proxy-connectors-view-tabs-li-edit a").html($.i18n.prop("edit"));
}
deleteProxyConnector=function(proxyConnector){
clearUserMessages();
@@ -364,7 +369,7 @@ $(function() {
}
if ($(e.target).attr("href")=="#proxy-connectors-view") {
$("#proxy-connectors-view-tabs-a-network-proxies-grid").html($.i18n.prop("proxy-connectors.grid.tab.title"));
-
+ mainContent.find("#proxy-connectors-view-tabs-li-edit a").html($.i18n.prop("add"));
}
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1242864&r1=1242863&r2=1242864&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html Fri Feb 10 17:24:24 2012
@@ -63,7 +63,7 @@
</thead>
<tbody>
{{each(i, row) itemsOnCurrentPage()}}
- <tr>
+ <tr data-bind="css:{ 'modified': row.modified()}">
<td>${row.sourceRepoId()}</td>
<td>${row.targetRepoId()}-${row.order()}</td>
<td><img src="images/utilities-system-monitor.png" id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
@@ -125,9 +125,9 @@
<div class="control-group">
<label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.managed.repository.id')}</label>
<div class="controls">
- <select id="sourceRepoId"
- data-bind="options: proxyConnectorsViewModel.managedRepositories, optionsText: 'id',optionsValue:'id',
- value: proxyConnector.sourceRepoId"></select>
+ <select id="sourceRepoId"
+ data-bind="options: proxyConnectorsViewModel.managedRepositories, optionsText: 'id',optionsValue:'id',
+ value: proxyConnector.sourceRepoId,attr: {disabled: isUpdate() }"></select>
</div>
</div>
<div class="control-group">
@@ -135,7 +135,7 @@
<div class="controls">
<select id="targetRepoId"
data-bind="options: proxyConnectorsViewModel.remoteRepositories, optionsText: 'id',optionsValue:'id',
- value: proxyConnector.targetRepoId"></select>
+ value: proxyConnector.targetRepoId,attr: {disabled: isUpdate() }"></select>
</div>
</div>
<div class="control-group span6">