You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2011/06/17 20:41:25 UTC
svn commit: r1136974 - in /incubator/vcl/trunk/web/js: requests.js
serverprofiles.js
Author: jfthomps
Date: Fri Jun 17 18:41:25 2011
New Revision: 1136974
URL: http://svn.apache.org/viewvc?rev=1136974&view=rev
Log:
VCL-463
requests.js: modified submitEditReservationCB - added additional elseif for status == unavailable
serverprofiles.js:
modified populateProfileStoreCB, saveServerProfileCB - added access element to new item
modified populateProfileStoreCB, selectProfileChanged, newServerProfile, saveServerProfileCB - updated queries for profileid and profiles select objects to also filter on access:admin
Modified:
incubator/vcl/trunk/web/js/requests.js
incubator/vcl/trunk/web/js/serverprofiles.js
Modified: incubator/vcl/trunk/web/js/requests.js
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/requests.js?rev=1136974&r1=1136973&r2=1136974&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/requests.js (original)
+++ incubator/vcl/trunk/web/js/requests.js Fri Jun 17 18:41:25 2011
@@ -436,6 +436,12 @@ function submitEditReservationCB(data, i
resRefresh();
return;
}
+ else if(data.items.status == 'unavailable') {
+ dojo.byId('editResDlgErrMsg').innerHTML = data.items.errmsg;
+ dojo.byId('editrescont').value = data.items.cont;
+ dojo.byId('editresid').value = '';
+ return;
+ }
dijit.byId('editResDlg').hide();
resRefresh();
}
Modified: incubator/vcl/trunk/web/js/serverprofiles.js
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/serverprofiles.js?rev=1136974&r1=1136973&r2=1136974&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/serverprofiles.js (original)
+++ incubator/vcl/trunk/web/js/serverprofiles.js Fri Jun 17 18:41:25 2011
@@ -56,11 +56,11 @@ function populateProfileStore(cont) {
function populateProfileStoreCB(data, ioArgs) {
var store = profilesstore;
for(var i = 0; i < data.items.length; i++) {
- store.newItem({id: data.items[i].id, name: data.items[i].name, desc: data.items[i].desc});
+ store.newItem({id: data.items[i].id, name: data.items[i].name, desc: data.items[i].desc, access: data.items[i].access});
}
dijit.byId('deployprofileid').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$")}});
- dijit.byId('profileid').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$")}});
- dijit.byId('profiles').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$")}});
+ dijit.byId('profileid').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$"),access:'admin'}});
+ dijit.byId('profiles').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$"),access:'admin'}});
getGroups();
}
@@ -72,7 +72,7 @@ function selectProfileChanged() {
dijit.byId('delProfilesBtn').set('disabled', false);
if(dijit.byId('profileid').getOptions(0) &&
dijit.byId('profileid').getOptions(0).value == 70000)
- dijit.byId('profileid').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$")}});
+ dijit.byId('profileid').setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$"),access:'admin'}});
}
function deployProfileChanged() {
@@ -89,7 +89,7 @@ function deployProfileChanged() {
}
function newServerProfile(cont) {
- dijit.byId('profileid').setStore(profilesstore, '', {query: {id: '*'}});
+ dijit.byId('profileid').setStore(profilesstore, '', {query: {id: '*',access:'admin'}});
dijit.byId('profileid').set('value', '70000');
clearProfileItems();
dijit.byId('fetchProfilesBtn').set('disabled', true);
@@ -152,13 +152,14 @@ function saveServerProfileCB(data, ioArg
return;
}
var selobj = dijit.byId('profileid');
- selobj.setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$")}});
+ selobj.setStore(profilesstore, '', {query: {id:new RegExp("^(?:(?!70000).)*$"),access:'admin'}});
if(data.items.newprofile == 1) {
dojo.removeClass('serverprofiledata', 'hidden');
if(allprofiles.length == 0)
dojo.removeClass('profileslist', 'hidden');
profilesstore.newItem({id: data.items.id,
name: data.items.name,
+ access: data.items.access,
desc: data.items.desc});
selobj.set('value', data.items.id);
getProfiles();