From 2d2dc2cf4326ff5c9a685ec1f968b2efa847385f Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 29 Apr 2011 19:20:54 +0200 Subject: [PATCH] Bug #587: Fix. Owner of the elements is now taken into account when adding them to the selects. If the user is the owner or the status is good (i.e. not disabled or unpublished), then the elements are added. --- src/sunstone/public/js/plugins/hosts-tab.js | 2 +- src/sunstone/public/js/plugins/images-tab.js | 6 +++--- src/sunstone/public/js/plugins/templates-tab.js | 6 +++--- src/sunstone/public/js/plugins/vnets-tab.js | 3 ++- src/sunstone/public/js/sunstone-util.js | 14 +++++++++++--- .../public/vendor/noVNC/utils/websocket.pyc | Bin 0 -> 15134 bytes 6 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 src/sunstone/public/vendor/noVNC/utils/websocket.pyc diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index fe3d087900..579c53aec5 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -416,7 +416,7 @@ function hostInfoListener(){ //updates the host select by refreshing the options in it function updateHostSelect(){ - hosts_select = makeSelectOptions(dataTable_hosts,1,2,7,"DISABLED"); + hosts_select = makeSelectOptions(dataTable_hosts,1,2,7,"DISABLED",-1); } diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 13f8b0d3b0..2824259d70 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -474,7 +474,8 @@ function imageInfoListener(){ //Updates the select input field with an option for each image function updateImageSelect(){ - images_select = makeSelectOptions(dataTable_images,1,3,8,"DISABLED"); + images_select = + makeSelectOptions(dataTable_images,1,3,8,"DISABLED",2); //update static selectors: //in the VM section @@ -499,8 +500,7 @@ function deleteImageElement(req){ function addImageElement(request, image_json){ var element = imageElementArray(image_json); addElement(element,dataTable_images); - //NOTE that the select is not updated because newly added images - //are disabled by default + updateImageSelect(); } // Callback to refresh the list of images diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 363b0b4eb0..86ccb4b57a 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -724,7 +724,8 @@ function templateInfoListener(){ //Updates the select input field with an option for each template function updateTemplateSelect(){ - templates_select = makeSelectOptions(dataTable_templates,1,3,5,"No"); + templates_select = + makeSelectOptions(dataTable_templates,1,3,5,"no",2); //update static selectors: $('#create_vm_dialog #template_id').html(templates_select); @@ -748,8 +749,7 @@ function deleteTemplateElement(req){ function addTemplateElement(request, template_json){ var element = templateElementArray(template_json); addElement(element,dataTable_templates); - //NOTE that the select is not updated because newly added templates - //are not public + updateTemplateSelect(); } // Callback to refresh the list of templates diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index da05b8a849..927461c1e1 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -308,7 +308,8 @@ function vNetworkInfoListener(){ //updates the vnet select different options function updateNetworkSelect(){ - vnetworks_select= makeSelectOptions(dataTable_vNetworks,1,3,6,"no") + vnetworks_select= + makeSelectOptions(dataTable_vNetworks,1,3,6,"no",2); //update static selectors: //in the VM creation dialog diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 359f203aec..d8216a2ef3 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -313,7 +313,7 @@ function waitingNodes(dataTable){ //not defined then it returns "uid UID". //TODO not very nice to hardcode a dataTable here... function getUserName(uid){ - var user = "uid "+uid; + var user = uid; if (typeof(dataTable_users) == "undefined") { return user; } @@ -382,7 +382,11 @@ function getSelectedNodes(dataTable){ //returns a HTML string with a select input code generated from //a dataTable -function makeSelectOptions(dataTable,id_col,name_col,status_col,status_bad){ +function makeSelectOptions(dataTable, + id_col,name_col, + status_col, + status_bad, + user_col){ var nodes = dataTable.fnGetData(); var select = ""; var array; @@ -390,7 +394,11 @@ function makeSelectOptions(dataTable,id_col,name_col,status_col,status_bad){ var id = this[id_col]; var name = this[name_col]; var status = this[status_col]; - if (status != status_bad){ + var user = user_col > 0 ? this[user_col] : false; + var isMine = user ? (username == user) || (uid == user) : true; + + + if ((status != status_bad) || isMine ){ select +=''; } }); diff --git a/src/sunstone/public/vendor/noVNC/utils/websocket.pyc b/src/sunstone/public/vendor/noVNC/utils/websocket.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6c9e76f921e63a0ed7f84f58d8e8e5a7340a4fc6 GIT binary patch literal 15134 zcmcgz-ESP%b-%N_TymFOks?LPls|MOTQOycq&{NDRb?ZxNJ)&Tr8=ubHXUQT+!>N1 zE@zf=XGJj;-5^$rqDWEnA#DnzD1yGUKoAs7iy#Hs*QN#f(7&KBedu%1hd$N){mz}4 zUCV0I7e@Bny`N{!J#+5)y!@B{s8zQw{LS6AO8?E^_p5l!6-Oygsdbc&@(OClQR}GK zdO@uhvU*Xi7qfavt(UU;kXj$g>SeWF&g#QzeK@O+sP&PoUQz3ntX@^?RjC)%&Zz2) zsr51C@ZBY~Q&XK|YWAT)tON16RLAutshs;!3kMdRy&ibGo{w2l=C1wsT@bv zqkAgr4juIYVGgUE6RI<<)~7AZ5w$a;Iw#dSR(TcWzo0fTtE!$V^{G-HuFooORQY4l zJC^sJB9R(%HPUVkw5#4bNVcO;KkzpiQG3TvbSKz|Tk(P350Y(ddfjdmCweoA_1S%6 zt}QN})qdEH54uSZg$vc2QTHGYwzd;}<J>FAyb!mVr7tQq@zdOq~`_59;EFa3(1_gV)=Uw!LMbVif{b^O@Q7~za0#zt1w<_cU>L9y}H zmqB4*owYolExV+M3A^5#{q?=LW4fInu{~VhZNZng~ zCc%p684)OGj!CnUHEYteyo=Fe(j3i3$CWpxyc$8_0C~sQk2Bgn>OUglqm1Zy-}FUS7DYFJHRM zH|g~J-HW3nYDXPSRx#V)%3Ag7-L1Ig`Pcdw)o}8{&~FpyHJy&vs^?6O^ZXjlWq`qR z=JWll5tvn$o#S~vXP%vqVQ@{G7TLE}B>?jwkiOoIBV*>hXtx!F^WCTuv=83B-s*Is z{rOhA?PE+%ke%?(**DJWB*MHnG16Fk_xj@VKva`5pfBI-M8?lql&8qDC@Pjk@rh7Z z_OS5yG@D^-*Kalx@^iDf8+pABns$~; z^g@%c(d}(uTZ@nU(8I(q`bPccVlN3gW^v!&Fd`%&6xo)py+Acu-06_f?3pe#!T6NaTyQpu1C$|^v!#Dl|yqI*iLRh0ZxrF&F88B)=# za{5b#vLzJ-wc$LeJTqR&#;bOG?#hKJMHMJ2OG(A-;boUkk!&O$2L zv1$qlGOIB+3QE^qmH~OjoI;VGgY4)UKY>=-GS|!$hP9s8tAR-%@}Z7!5WwI%?Z1UX z4%O$kdvTB)Xv^g(7;`M0#1m_ULJqIdSY5oo+Q^h<4sXd14|EuX^Vx)UesqmFm%^(@ zIvdWE?pzp&^3$6^$3HK-BHHh@+B;iu1g(ng=sBzDIq^&ehEL_RtpDt z*u%HQoNX_NNmzG`#R(SEEVw6kg2hP|wEFrd z`v?xT(4^UUN@HTS|g&L|j>3^kZ=cF_2%w|ua>YON43PVoOnRJGnD(20|Zw-A_ zr!BGp5GdV59*m#|q5^yhn~o=mr=wuc7-}LZ(3Ud>Ol#m5LvViq@S4{?v+1_y# zOeokN!EvGq*)V&EtrewfQa!|mt2om`3cZvEk3*GAspJHwU_Sm|`gmO(mej#n%0bA@ zhmZ;BPNq}QC_?DL-Z`g~%&3QuQ?J5&J{$r`Awo~8!WDyDwR$Hlj*y>l&+w1qTO6dbnWXFAFV5Ldtm|!bxbwpYF6TYXmHMrf z`pW$e)8+JJd@JnYRtN|p_GrJzyVe@ZaSSQTUO$e*NNUUP-B`LM+wgkbD^j5YBP-xt zguPBjkX~!LOAlNTuI9kVQjK+0z~iTg4*zlc=()q{mEc?cM|h)o8-*&=ARSMjoN}g$Q|dTcD2o-eXNohz7}d+-OzBqNc-CF0 zP(NAF@&(j6^O<;0E}>dKinQ72Z5}Oc_^qs`_X%o-+^vdZc9TSa(nTZb#DUHdev1W4b4fTnm8V-8_2m?iR1_N8@gn(|$ zkwFYuM=y!P`2~8J1#L+D&&0|~U0ot7yw!$9l2}%yKk9N|j)i-RQ@Fe4N0&bqk>njc zVXf2r6mK=8qXJi5EwqU~nGR zor7g!dBeV)1>IrCUVq#Y2xWD8>Eo|c%|Wxl{iWuEhPp?kcQDINepE5bzgeKdgZ@h6 zKztbt{i2$|N3t*c0Gf?HL`hxWYpMrCaa7HwU?-vY&@pCFsHy9G2WB_sXjz#{DD*vs z24GJ59naWMN9w5N*0Rww*u?F`*XDt!RYgMyd){8Yug#axxe`8Vbpo$H`5Fvd&0z#$ z80SD3DfH!AYvC4m605{S7oc!0c{aZQMsNG@b7MNK!G9x^B1|T{17q{5Wv3M^6w}fq z2s9b`+!85Se%$sYDkVZty7Ikwa7{cnKrJkR$h$ zgXfcSYN>%6rw>P-0aD>Ro(lvc1oAxq`JVbjI3N5C#-2W`Qc6IA!2iWbdNQJ(2>*X7 zc)}wF9*sGAIOZw}ecKQH7&Zr(5bhfIu?N;hobq|RtRH>lE$}m$u;I7o^C|Q1`v;ew z-+jfcW43#j1<7qFAKzVBdE3lUdboE`2){rr3x__8P$PPQ@ep}QT#CF@H^;rUokYze zeV76U6xTK5Z_AHh^vhX~#X*3=|3Y}>@<9EH`!&9RBCRb8!rrc3+5G6r$63#nqvd7p zcgqi(h)MnsRYPY@6|2zaRq*k+v+OJv1jU8V8Mnf>^sT_7V8!Sn*h`GYvFMD*S+E^^ z9dII;gL0Q`@p^3Nfntrq$-IU_H@2gFoy4t8#9{R&Vo^E>8EU2*tPv9O7j)fPM&e(J zL;0&%=)Q|WRMtK`eQUyPc6w&pn$==P@vA2hLc>Q-$8-lj!5gj4D$w@H=~hI)(2aYx zbnDK*i;^P`Aq!&Js0#%@L_kBtr6JyWt(SBW0N+J`uC?XcIAz~6*WDNq%Eve$Bbay`>aEyhI$h(c6$&DN2U#NEY9eul>yM)0(AO7P1IB~GJ~auA$D%Rwp62oauP z6GRF%BK^etyxssk82Zq`X2vUI6T-G(2)@6+XF=ykH!LUi5s>?Pytuz<(wZ8BtSg&d zMGrnYYzlgYAb{9#klpwnpB>^-q&`khNp+D|vSj(Z;R1aCTLGe9j@hR$Jz!ZNln+N6 z7D|7S2zeSGZ#m*tV+!Q3qoON-n*l+a%h8l*CM7jZ4>`{;PS7BP|3nv-Lm_#usfT41 z{R9VlgnwScVa` ztV*0aA)$e{7#ctvfC>$n10caM8;R)eR-_GZ-FxUTVi3an{{UGAXg8!77^=8rk((MM zkwiGSLBatgpu8q!$&{FVh~V&7F`KquR1XnFh8!XFAVe@L zgR}R8g7lvH1>-;}qny~B0Q6$IP3Uwe@!%!pA-00eoVM?InZ2aQsPbM`hsf^0+^7i& z$=T>diQd!fC1S5APm4i~F9(zONlk59!&neJt)3tth5XVPjG`u%gLf7U^u22PM%Cts znmGiQ;ERAP2vm{MWr)dhJa7MmgD-gWkPfsKHdm%ugBx@|vrgw$C}@cEnz!R>H&h%ehn`v5|ly-;#r z@Inxx2krc@wbAjtivy&3E`bJMe34W)jOjr~WXKJK42YCHksFuRE7QIO@#M+3Ar)tz*ma}3?o_U z+##+dh}oHO@|?Y=aNfLu!8GkM_`aOwXaRVEk?bWxdDQ$^%EZIH4$_;zM^ZK#0Ffs> zA1IhYhM~usHoGh5&(j{#MA&p1@}=mkFq zu;3!Beep}gKAfH0AaM4K8V=RqL2q*4ce5c2j%I$3*7YfLx zW?TAgZVqk(j)jd~z>pW@@TG-H8L^Mna3!S%Rpvhs#YZUAWVvt}xw5I^bP=)M!bD-5 z(cHrE!VEHH#}U;i%YPO2BC|GC7%7yUDs25J#6j?1alF6?@dUDJ=tGW8OKqkwRT?i$ zz`x{dnOUef)5R(0l|rr9rc2C+q`HYm(kL_|#BiqG@4H77NctvZ0CmtN5*huogIgbr zF!j1xJX(sAL(;dujh#wNP1(>;wt3k&`3|;J>MUPI zOS`>Lcl|hsJX~7pP*HD#ee`|{7gQ+15kcvzI)r@db|(ZYynM79Bf=0Ao$L9oifsyc z_H)y+tKUP#eoh$NG;m?4Tl3W#qRzoL82q-GQ&tc`f{RmBkFQA_7Di;WkS~FwgxDSn0l;FqK(R5-9T9QkRds76t~ z;v942+Y(i>mwa2{Sdx@IDerND?8^NCYkz{`NVnkrG2U=D=fFOexj>;6@Hv43c}zbK zyh!On{E2j3?uMi+fi&br%>*qtLYTmYvl(V^8I2MRB?;VL_I^e2S!M&0_qcI>28GX+ z$6WFcB#bF8eP4)5Ja#F9Wyu?F!X%{2673&Kr{cu6i+8*;^Np?`f2L7Lt4 zl3fIa)`^fBfUqTI{kV*%Mhp8$c|tM{ecbNn++n3|1xPW^B0T(G;1e60VTnW>N|90w z&x28H-|5Jo& z+K{UVYhYgw7^fKlVC2T+ektU3RKsEficT?r5;75i5xzh|R>>(w8yFJ7H8pM!u?C4+ z5%k_4^aDBRm?Sm0+)8`7>;a^h6%o7%2^UE?8({^I7SSvqEZLMmVi5c$ApJNa-4gQN4+~DXp>V0?oWQ}g zIiW~cXP>3gjSM!B1hk4uzC?0ixqu+>@V%BBo(? zh)3ay4Xzxa5xgN^R~RYnM4YhS`9YslOlI!=6kzcXqP>h~j^TLZPVti5P(%Koq1M#R z@x6uY{v9ojFIXM0Qu6hKrX^*9y;RF3eyhDbV67~CG1id-fxG-XaU`)0+CjR1w)^jx zgKdO2PzvRMaOIcMC=NW&56=tcf(F*7ZulTZ`7+6Z2G9)3{VEDk0PdTp*+gjOnf^9Be4FSIIU?nR7{!&wL$y~eC1;lVlCXbg^Mi9 z_r<|#tlfOS*|_g6-?(e@sn+F)x`{L!YpYF8!E74%4O~iD{(58i#?q22s%nGIRE^Ln z_(Trd>xTBm-V#UNVev;S&T|g!mCT~~Q}zmSKVv+zVx~}3!?4ndOyLz! z!hx%ycNi`j>^ID#6*mk=ZQ23P4{;=^cyVrb?ry`5hsz1w^|+JyDzbs?jQ-;_V~NPUbnesl?B~$ z>yCF=6Qha_ndJiEK;bFjI+}N`aGkKn&(Q4CUus8ix6~!)GSVSeG0LTKrCcZ%X5is#hr z?S7919%a80uhv8x4-qAL#uI_mm&46?gj5&<>C^lu$W6BS3-UP;RR|BX(GWkQh+o+= zr4v=8ludhK3Qg=5+Xf+E6QBuNfPm72!~u)}4ncjB6#Ni%3CZkl*lPi#h{%e*q3iO+ z!u6^06XuR3fH{I8{+(0a*vGXq16?U|_SyZ*iYbs4c;~YFV^U2nP2q%3_PrkxQs|~p zA!mG%S74;Vloir&({=0O{1&RhB@&}!KroL2+6fd8!WI&E<3UMdZb!=^|A-g;H8-2H z2)`%UgTE9mHgbfm!aB3t9oQRp=>9f}flaV)Q`F3nqAvQo6Kyq9I{l2hAkwN(mn$-T zaVsa&{W*qQ3Rah!cK;bgA3>=d#Tk5x*ZetA8$qS)K%AAwhO9dHTcSa?S8Nj(#8vJ` zEdGiGRlf}o&$C85$yyK+x6S{k&bo}2wWwd(*