From b84a8c22d9da828d78cfd82c393b2b1cd5a4d55a Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 3 Mar 2015 12:37:31 -0500 Subject: [PATCH] Ui: Add portlet id, fix select content selector for collections --- .../scripts/mvc/form/form-select-content.js | 2 +- client/galaxy/scripts/mvc/ui/ui-portlet.js | 1 + static/scripts/mvc/Archive.zip | Bin 0 -> 29497 bytes static/scripts/mvc/form/form-select-content.js | 2 +- static/scripts/mvc/ui/ui-portlet.js | 1 + .../packed/mvc/form/form-select-content.js | 2 +- static/scripts/packed/mvc/ui/ui-portlet.js | 2 +- 7 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 static/scripts/mvc/Archive.zip diff --git a/client/galaxy/scripts/mvc/form/form-select-content.js b/client/galaxy/scripts/mvc/form/form-select-content.js index 6169c476e8e..1cd3a382920 100644 --- a/client/galaxy/scripts/mvc/form/form-select-content.js +++ b/client/galaxy/scripts/mvc/form/form-select-content.js @@ -222,7 +222,7 @@ var View = Backbone.View.extend({ } // identify suitable select field - if (new_value && new_value.values.length > 0 && new_value.values[0].src == 'hcda') { + if (new_value && new_value.values.length > 0 && new_value.values[0].src == 'hdca') { this.current = 'collection'; this.select_collection.value(list[0]); } else { diff --git a/client/galaxy/scripts/mvc/ui/ui-portlet.js b/client/galaxy/scripts/mvc/ui/ui-portlet.js index fe2311e93ee..929869532ee 100644 --- a/client/galaxy/scripts/mvc/ui/ui-portlet.js +++ b/client/galaxy/scripts/mvc/ui/ui-portlet.js @@ -8,6 +8,7 @@ var View = Backbone.View.extend({ // defaults options optionsDefault: { + id : Utils.uuid(), title : '', icon : '', buttons : null, diff --git a/static/scripts/mvc/Archive.zip b/static/scripts/mvc/Archive.zip new file mode 100644 index 0000000000000000000000000000000000000000..102b75b3343753f5064b8ea2e791a288a80c41bc GIT binary patch literal 29497 zcmc$`bC9LmmiC*rZQHhO+qR8L+jdquvob4fyVAC8+q$(+pFX|M{(AQpaU<^Swc=gz z{xeprImd`+{^oe+vlOI(L7)Kscy-tsiT&f|pC6zA2mogGPPX)_8ZZEF)%PlUzpn>C z6aa)M>{-D=5P2OB*OGp66E3WhJ0FW^yCR?hOVpVQgMItB9* z`MJXL=kSdEtay!`+p5(itMGg1rCha2g&|_px!BG7w~-!T`gYgyGNrC?OHCH|L6>9iyNP?>$E$+dO-~!=Yx#ZS}32=FM z%m+epW4Z JIetm1*d6w+`0o?~zbJ9T3)3P1n=5Db8S%=v$$Y4tB@g8V(_`uehh z!t%-*|40>f&ArMW*MFw!zYqH(RsRb6SDODC``@P-^Z$sY)BoFy8ylb+n;RGzT+7O+ zUBjz|EBFJ&V*ryQU<1}-BLqF83XB7&6ZZH6bA$$i2xg!%=pO$uT5yPa%%u*N-=*mB z`}(hntNqL95&yH|{ulzSiJ^-jot5(+Mfb-@CjMEl8(Px#Ya9q&N9r{KiX$lUFF=Eio`O_t z(j1GI6Vf72f(+gYxat}>m~2J@+MzC~Q&HHp$C%8OFfiF{iilHarc zwfw-E)HKu{kC=7{7mq}Jo+DSS0G1}%JZq5YVTqys&`v4;EW zQt*2$WDMZb^Hk?O+jW`W4r-7h0iG!PgSG;Cl%oVt6f5|MUL?(iiIQb*FtKof1~6R5yu~I#YMj+mCcK5`7Ohr1J^vL!TJ*sL-C)Pm>h5d9Qn=eSMMQ zky9q{_P3G;RFPL~1^9HDq!-{3lv5cKZ|bv&5dIH23$+_@d-kSkD5oxefLP!F`=hMs zS?n@VP?&*6tP}#N5$gn6%N3&agddb`uB7vnceotOlhJmeZXp6E*v?$Nyt{8k?FpWq zv)CDQns3M%Wfy3r#hH(*tyB5d9@%ged6hiw5DT@;Zs@3MP#+W`n{41y%3#57 zEUIJH5xs6IE7i&E&mw~KBW4891%BHiUWZCC&~9OS z99KP1)J*N(*CCVCs@Gst>5@@FRGJNQD-tGPv#TW%%w^ZMnYs?fOq+0-joJ-PjMX?5~*`q^@t)c2-% zhlJh%qfiF9JoPTcL#TyoRqXn(6#P_*4;j7Je&5gNyP~o30;mt4^%3FDz1^0w{Zws* zlyW7GcB3_HH$9m!-K5zuB5;rEI`o!Cz_VmjRW9OpSu?F#e6vA>ly3nl&f^zIW)M9z zt0LEF8Z8|-fkHQKeaM3s?VuYxFvu1Lm>6=Tl&o2OX7;Bn0>)a8Xbe

;P=<5*dqX!H|ogB~;mN z9$88`3V;9s+v}yTm}L{=pZ;!Itxm|ZEL{v4Z99h17(zM%Hf$bGoS(BP9%8ViRpneK zee8ZezD76XrTQsB2$l}gDXW|3$app*@I}em$cr+z(PP(eBEK{R#SocJ2rm`5ur%hn z42OfwXE`?kJNk4oj2vw(WWutHHw=XwU~(Wx+kbS7ML|WwrSAA2Hn{P`a0*t+jlV8f z4al{g1QeaWxuZo3g^w==9Y81i3I|<*{dPl<0)(H{*byW&HJE`$OzJlZmDA;)BBq!+ z=nPfBHIo`%Wbhqbxi73isi^@`L1*t6W%PNPRsM$FEf>-T+Z?$Jdr7XpBa!wG=6gEl8jx}RzO~1Z3AcO-YgXCP z={cVtH9R4@*Z?KlqRSkZMs3QV6p^6(z~yjp>Gd6En(@Z{gP4yx`Jrq#v3lLKkunZv z*RVLOGyAAW9$jGXh6%d!mRQ?VQSl7Y>f|$P>J9{}8vttQf<3JDd@u>j8Zfup%o3OR z$@dnsOKdZMU!YTx;8wXc4D4Bnmaitz=b^Abtj^?|@Uj5I;;#sy(c=kLCp{nR zdJcN}JErrxD4KTTmZ`5qq?Vpae_V3nS84+>Yc?IUhc$gkx}0;`Dy}`eW9#aZdVnGp z!>c;Baifsy=5DlgigL5Nx$Zj1-)MgP%Ap$M|5QYuX6ajPE;fAh+BPzgoKpCkJoeKfNIb^!w8_{_)MR?*LXV;)yn0OoX2&V8-lZ^3eCK` zEX!|7$$rBNlXFyVmcvQb(*jA*#k2ue{CS+&zk8!dF>uv^>|YCuDjJ+0gXk4WL`1C= zl>(cP$K{2$y%bYvIsUaE_h7J9`I)=T%Y|HERQtn_%T@GH$tAA{^KQLs?i|ORHB-pWr3+q7@~$pDi5xxdk7LLNBW<)0%s zEwBFFEfHs913x{Y(R>`|5eCgn;N{wfb~Ldod4-lgEWTGg9mDPZmSOd(&q|LC1eS1f ztiZx;P7o-*+viwyz*Ac^#Uf)JelhKK$q9{GDDawPqYMCF*_K(T~`f(m33LpTJ7 z;>vyD2vI>Hon_4p=cg zy1%)p{NLEA{x9r=^l$8BY3JbT@+Wwj{U- zTnK?Fp+qK_%V%Yd7Rv^_!?}in9JDS=^QN;tuDFT`OWK%r4Ub65z0k4ANyBmr5$PI= zb(%{sz#6s+f7t{z$rUgX8NQ<^8<3f6nkbDoGgD=O1$pf<-R6X8zGfLuZ25qqVVAEC zNyw+UbF!2=#;MTcDl8_?qZ5t*YTdT9@?_01&WbCd$S3IJbc!7ZB~aFgLRkj9N0TaX z2Acw<1ZiuXEZ!Fd6^~&M07TLNUPvN99Brw{!++07v$^VPilVKqt_C-DwAk|k<2z^t zslu^LTI@VK+syh=g|VSYlm4@~sI5s}(WL_(WoK+`;QCxJO~`ilW8R-tUU>YZT%dct z9W@!Q!PATS*dE^Rn1F z{Rl2nhQ4gr`vUV7PohWOM=x&|Gqdl9p}futXD4<`&J;Fhhdp187P|UGicr`be+Ojm)-;g}g?p;n9w1TgZGokT4qP&sdWW7kc z$PSa8p3#g-zCrOFu$u5-O15^$;(ww$mI?z4!2&eji z)ATlbvjhi%uo}EpxH)XQJl%2kewVx7OoiJpy6hR3_^A-J=y$=bO*bi&fV7PI##qCr`#MppF{|rW&AWwOF5XbMH1GwU?8KE0#p80rA)kFXPy+$>V`w7*XQ6^Lrd`WEc~VAFGHK}8r`vH zlW)A@Lt98WJJ4dN)0;n2o&*=3ee7xs82Itg&^dPu=+<z@*kpHaUf0aVqzfFbh5z|G2ijMVcUtRrCG>Szu#SXOq$UsAc zQ=B|c&?zSe2cUsRbE#+)#x4Hxk~Ku21>f|kL@-tmt0GZ4$-$eOhLEnpiIB>Mcm>e3 z73**+A^JS!oQgn{w0GH@GbyP!QsYhr4(^G_tw%>Ja*`wKjI8*QB6bA%M=lAoQc--X z+!}^gxvdG^5BGio3^KW9M^@Hk*TLw zzz(0z)L}$2jbB;}!~)H%VvLo5f*=$BG_Fvmquh5Z?`6N+uYEwG=s|6RO*{leFQ|VI zOWx1G7954EnUZ_}%y^HftMp#-#N{#D&|@Tt&jb2q+cT?JhB;wa9#U%t)QqwgRErdd zI9_Pp;p%P6NMdS}5hWa>8kPSvt_D5QVh3(M$iD`m4V6E%NA|UGDax2CTYhg);UFkA zQqad8P28s(qb=Txf&`(8!u$%)S+yu#&&74)%P(kD-HpDd#z8TxN(qpM4U)SwLEP#8 zW?)n=klx;5im?C~&9FKR-nS76*G6ncjA8qWy@kmnHNJ0^Ccq^Al>pmDD)az_z+nW% ztEYk_yb5u@F7P%c40w#ScRp})eLXL64JV@+zIN1#kU)>g?V^|WJIA17)3--Q+FxwM zws5PfwUK-h3>XQUhrp?J&56Y^?Sv^OG69jsTbZk_#^3u*W;`bfKD`}rON#@ZUmI_L zYVjjpm0+5UD`d|@VdvJVX}b*z>dZVCk1JC%>Sc6d=xg1; z*atpP1uBg)*RC0hx@rP_7B`thj|cpu4eXie1`SSxo|rb|u|I>@2GgBJ+Hf#|PDN#c zTAg=TrC}pVSzTulqS+ayPI4TeYzh}q-8=}1>#BvIt2q+{<$8F1S(q8GAlc1 z(-fS2D~KazEKzSSb^Oy!!&KX%#>!lv5ac8Jn|xS^Nj6zPZlg~*$6yNN&gTC8PkL<( zBea&7^|5H{A{zdxlY4_qfDKOlC(sESeCab+a7L2GEC_C}=)2=&w6XVuJ=_VoAF`uM zKsw}>*RE;LWWZE|ChifeC6+SE7fA?Du)LWibqqhKZxkg<$qR3mF}NXd9VGHCN*j09 zniAc;nscjNK0~&3+pk+*u?Pj0ij>yKoN&uOW0x~VIc4Om8i(}3ff(a@$vDj zuBH0g7zgw7G#J*QqS4G6rZ9h3WA5Naf;lZu=LQllluw3l4=1YX_hV?WD4n}lxh5?J zdps;jY?Y$I`GG>+pelK!bY5s)2SFi8_A)ST2v2y~FTjLsD#BdU<2G@NmaP#G1hIvY zNW_x<3Yz3)LHX!MC4sRb3Q8b5ZA<-T$_dU(7c(Lys8$v&kPi1IK~XeS_%DL~Oo={b zh1?RT1tM8FlR&u8Oygb4P^dss4x@VHlbM8V>o&^X$(*zhSffUtpu%bFvSDux4PxnUB;2?$eN6x?5{eAp!FQsvUiAwGa{HJy&*2PWCU#Q zQ2hQ>CFtYX#+<^mF`wRA;KmzpEA{AiVEtR{On$CO)|;4K2i| zImHsKg!{o4>iOlTOzG?r_(U-`tm9Vud=8;jzo^HrT&P;>Q9r)zK^eW3UgBeE0An>$ z9W^1YzmDBpot7URt>*QcQNwaxua3XglMwicL7g?VaA(1F>0bwe5dmAPNUJ?@4&8$+ zC@6h20q=$hX2)N{%MKNmwLTW4B}!yTPTrK-EFmJ=C&YZkDbdTEq(Qd@JAtQi_ zD;{Q~4#q=jk^N&)YGUkHjl+;U;|w-@E$$= z{N!V3`P3wuRrq%w<+iu_dd(RfLcE#x@_}BWcK0M7Chi($?&gfj%~Yuf{I!6I8Fg+6 zYb3w^Xii7_?QMCV{CJN}*`>L>8$E!C%t0*S9jR$$6D~hQUt2vG;H^(06>cP&lK_3)tKn-DB^!y znE#hhqWLc(nKdf$n2`n(cCC zCyJ;*RI+R^5p04}V)5se_j|nP>|~-HGY~i52Ktrn)1GH7z-W_<5*hZSi=gHhX*pk7 z(2fxOx;JM~-5P6Dz~0t+e2PJtMY$Jox?~9MlI)AAnt(@RkPVD_U0W@m`Sr+aM(@?8 z8yNdLOirYcqc2=8n~pGX_~26xVm}K41_#T}HL8)KfHzosww|Jg{9YT3X>m!eO%Grg z;GZG!X>^n51F`ql=;lw?fP9IEb|Jo2Z=GiFU~&4qts>}6IJB6-fQ^lI4ai|%)qRDe zJh-u@9HBi^q{)6v?mbRi&f<9MM@ahwA|yvliQG57YR@p&?@Ni;av)z>oQP)j{Lg}s zZedoT^OFV1*9b9*wEFP8(y=?Y1FMUI;f)RxrQD0vE5}x;$HC0Go%BdwRkQ@PIWjeH z+KFJ(^ceM-(@Y0u%R+m*K^h)(ag^Asip}x8+8^l)Di2nC_PHd{W1xnnR(uL zBL;eTFu1DZIdmB(!}8q64X7{{T>Gqr#qBW8%}?#Yy&Mq5P3{o170!cA`o?m zFIMCPrQa>b`o=TTy-y%sV-a#uY{ObnUZ?8A{&bTny|&G%1FMZg4!uqSFL%b21*#t@ z*(AUEt9YP$a-GFWpy5%okdAH^O?iL9Sg0NcBOV2%D{WRr{@$$0Ni7TFbo8xJlhpHw zI4!zl%F<5wJI=J9sDejd8YEQ8CwL%KmVnX`0W>O{_b_Fu&^c)}smw9AkEcu~sam-q zHYvrJq)&xI5zmDZV6A6Ha|QY5DID3*f%HzjOm}ykRe;p*%~($Gy4WUmxx;v2XhncU z#{@1)p8AtGA5O8-YyHOUPbP~=MP_{zAv!TY)eT1PK^gx_m`nYOzAcb+2~<+F9a^>9 zA9RdEYtL@t2>vJFsRy0?sxeyUJ4nOrhLP4`1e-Nh?WB5r+#YXkBoAZo@z(oEiTYg0 z)>)=J)RdYJ6&D$sJ#c_IcvoyZShmJ>@HRI%OT<455{~XIU~xh8&_)41f98po7Z^X6 zC2fryU|_etYqbe|iIe>}e~{tJ%{6iAzW$}qOtM$hOaZI?n}IVkASE=KARGz>H|pgs zbcE;Fv?v=oPiK7sbY*-uf3^NBK8hcQ!S4v9!1Q z)BbStpTa)ydw;mzbi1M73k;I7ThVy55&_*Hh=1$gKPUZ)1Oi?4>w#%eN;^Tz8~b^S zyFW_gra*PBgfzM_4QCSOh_7gAX-OSqklve4LQ@$q7q>7GQfQ>=0#2kx>9&cmp=`L8 z_pwoHKat0&mAr%VF|j5SSA$qoa8pvqdM1(Ae+gizme_!Jt&J8xxKFW3b^wvMC*cB< zV6+SQ{nu$d*+iE2Y>hb4Yb7aNWck^H>VR8^;Y(OWS_hi-Lq;Xa8%JG#na&fAuN}$8 zB2Aaec0qJC&YIk!%xe?{$b)0yRHB}Godi9;r8vAyotz0i>vWa<{LSr?M>6UQ=!#y# z(>Kx2>I}_X^fZRk>{5pD)N4!`0Uz>j_tuFEzH< zYTHkNypoG5FGm6TJw4b8u$3=YHtD!O?8HM)Zd!;g6i>i72_^wpSncs3dSnhs(=`B- zdLX`abw%1KF`?}6@xp7vDl#J)t=y0o%*zM!EZNlAJf*T4jaKBZ<5-Vo(fkrEAKjkK z0SqKX@;&Z^kKjQ9*b(YO1PEsXTJUe8c@iV-NTBstAP3weFfSdeje{HU|Cd(6kD4eY~kzaH?` z!|%0tlZ`UtzD=xB=936zWCTPN8;#;YKrK_2-w0Vdt^8-azut z0%_t901d?H1CuiUdYFYpi8%1EeWphfyd&_=Tm)2EGaETZ34l3+>EK?ooSQj{6sLU zSqF3sR16F#Bm|!p+lJbu)q4G&*bQZmn$p0b5YE)Xgy$y8;&_#(ChV=oX8|GOX&a`A zZFGj$q7~)yW?>y~aL1w^TPHeL_%f@|0e&L}Zw?>$b61v=|MUMD~%n1@ea&R zC4u7}2dfc3#?j;%ggt!^K5gJir}R4qD7pRexW?!6p<$V6{m!9tS(6#gY%WfOuy%u^ z>nSINdf^?DTE%5XlT#S)AtZNsSyJ^h!A^YV{KF+#|J-6=lhw1SP{=I8!qV}n24ho7wc1{Fy<>t+s;)5A??_HQ@D2kPxxit-$dEhC~pD8u1 z14>I8XY}dy;;`EDRbtTa1BrHSx~yqNEw4OSNj6N*j`*fZf?}T&af+HQkDT9FTK2NN ziQlM_1>~1PHSy3glo9tG8usHin;To&6e$8ZVqDljxvbEML~+Id)FRLi&ox!%U0roG;0LF1}~(^wgGM3*pGo=WShQMlJvWMXZwT4`uQt=h8!gF*dWQJsd> z$5VD)3BQe5Sw;Zzs%7OG#Y)?Gtn)AXx-;h~q=sg+48YmX0{IeqZ6aLuGy{`82VAkr z%3W=?aIc$GU=e)x7HtFCx&Xdn_URuE!fVkmC$J-L@Z4beV(Jfx%G;R@yt%TGH;W`42Q>VlT4N3yt>}0`#nd`ywKI3)_)1GZQFHj>y?(f?RJB1M&C)M4YA%A+R2q$;@dNN50W2Se(Bn<*n0~hiWsio1dpjE} zP+hSAsVJ)`0P84$UzcLUjoY}rWseLYJ=N^{ekzxYMu%WaQp$di<=gs*!Wees3!q;5 zOZft>H=l!bX-q!=qlOx-IDNKPkaz<}x>`Uy4v7Ze8?%tFKN#@QxY@2bMJJ5IT$Mc> z3o@FXG`Nsj;VtS1Y-F1Uedx(Fqo02P540jE-9^P~5uqoI*odC07AEbH;R(yoMoxG) z;K5oevRmuWJe$$6cGgYlsDF04=C-HDn^3v?7;Z*3awnXlDpy84uIY_J(0h3~?*_(A zxnFtSbY}X2KlqURa7-WEY6fY$#dZq~1;@(sL8ByHYf60&kLQm=2QT4<>b)tOCkWM( zx^oMfA1^#n;%>U~#$Y&NG29uKF8FLJN_2b3P1viJm4?sqKi7zkyzTW&hPpj&+R>m zb#;daz~>pXzZhDvN|Ym9A7%VbZQNvHK(-oFtmQY@7emKQFA^s1X-#?#63;q3?Yb*; zm7Z?pXasm&o-wH2r6E*5V46mAVhy4gWna)3)P9b_q^e;=Ib8~zZ4Eaa=1`HFUSrjtjO7;c8Tz(KF*C|kDF(blX+o7S!L}=lj18IBWjuA%0*9_Qd;Rb1}HDs~{>)wvYiV3hs zMojcz32*8z)>T8)u9}N={ear{3HS$XO8tIVX$%PfAV>9Q+WafD;r|_N{yo3_FX3j} zUvLxqFSu#*8#rl=?d@Dl?f%?O*#0MVE@*Ao@3A5IJ?Z!A(olI@k6A`_aby9sTfn!3 zZ3??Ty&`~s(atbp|305bh2K2!<;(mYFA?dKJb(v>8pwedw*T$jjDz{!OV&xPp2^&F zFeClIW=fi^TS{vLx>l__iBvMyeWmT-x}M7^;l-Y0!fRPmb3IJodth2K$RH%G zv-E6?^fuK%FEk0~(-yW72D2aF+D@Oua;HcJ2=yZa@YdTt%M>K_aze`NmKeiJxi7!` z=D~Zc2`K9BF6%N7nsJ7XsVXE_LiJMG2+_WvgwjO>8Hx8~q|SSxRV;pnQgnAx0o$uP znx(}gb)9u_#b`jN0-0#d0!V3WxwRi4oJZ2PFN@_;EFygCMa660j4V@S90GK7l995a zwF)Yz35#8=O5)kgaRjcfH`eG%=c-Zwm0{ykKa3Zhng=eptY8_7e z#!P`}=J+{VQSUT-RR9YG4{Vli&#t~{IVFNMGvFo$|!Dgd02!hL&~tx1q1KpXRK)DYZ?Pg(x%94uo4OH<26?uIwS~cz=dfoU2X@Rb_Mz2jKlpY*q|&bK#jA?Za?v)4ew;+Rz0riB;pr<&SI+>yhMUJ zLlEFVyI`I_VyA@NOW+@xkL9E6)4rS>fgW}~^n2KqH!boRN3H288^AM(Q*vU2aY)M} zhmE#F5#LX(5oCm@-o02l~#$WlOrBfE1*38JHY zgaKbr3CX*NYIQu+YtvkyV#mRQa$$o@sn@Hxl-kCeEN+{BOr$K%YN3<8F6eUm;-2m2 zkaOnjzX52bCRaSdg8NCjtEhECoe_o`#1xM;tX z=$FblHSKXLP`njP*bsm*MF7hPHaW7^nCT(kio^M;x69ZSwq4*nCGf*DB@E6H%^#e~ z-%w2`77#Fz6Q}v$E7-jA+_H+_dQ%3x!k$5Ma=xZtvjg0Mq^PJQW?xhLSWMTPmY&QT zw?j^<9&iOKP35kDR~%YY6tO>djqwZ%0{9DFqfeyBUcv~Rj^rMeu`j)yDlDnS-Y!r# z)OvT%o-g%%6+GB*K&LXVj=gBq2Iav-LpwH}87x4!FYjC(%vJIa2d&Sg~s`+h>@L};1rmOVaZcHl& zUssm=&Lm$;joX$3+Mr2JT+1TD&2zNm+7@Vo4pog9aOE3M`E7&20W8I3V)j62^<>qI zxhkyRuoGA5<_7t3{ZKVpK@wOvJ7o~p{AATo1G`(qwiJJD_hU8<@e{_6qFQAfO)-!R z5}D}oW6%-GocmzORaF^TkqhJzl}LVbS>_VWVP+9f?<1R~&2eO(yOXUxTQ)Lf66)KV zRAJ5dAIMrr#+g~^e4bvna}*PDD`NksV^-{6ltclXK49XkX^_M}` z=pDJO0J@L}Z8}bbfy0d41?lAL@{4=$04R_W0knjmHmAky+toKhJ5Ul+F@w0icoS*C zzy-;NQeN&}IpOMn$Lt*OaYvScWsn#hZ3TqOrpO}C?Nrz+248_>fIp=PYSVIH$KPtY zi>24AR86o6e1**53<%oV_;eY^K38Loj7_@}I8cy=oXH6DXLwOKqVD+NDh!>IGHHq7 z03xtzOw~ZZ!&x?VFqS#wb_Wa2=G#-$j6m^%$e45na1_cH@T5*j8t0MiV+)%Wpkm9l zRANZl#j|R>A|F=-M?Jqn!bw+X3t9@OX!R3teYpUjd32Pg0!O^YH0*x#fozL4Vl_?~ zcZDJjkU5j3M$ab%eWuKXGN8FM@G#mC4PdJ+8?YQx!A@M|>M4N!^7n@&bS%B>FF7pT za0DvNf+Z6nk{S|S%8OVv} zm6$sxDf5u?*h1L10)Kewp`X*&)!ODoK2IBnf4+O7RC~{o(i1)w;)qx3)4VZ=sE%Sd zc14X6WeNipGoE;~{1F zn>`gN{>+|#B{;IbXV3o&%>6GR=wFRX|LzHKvov-8Q@is&O-z-V()R0Y2wiXL3<3z2 zu$62S(^0xl(?xMOKp>Lq(grjwNR4CZNUDjeFcCLO%B52w^Fh@8AfLk*w*>Cz7iVgwxE3gLLs^)y2%amsm`_zKGdf&qAcOROfNAw) z+}A(ea82HHxW5N}qv!++A{-It1T`@HwSSoRp}lncl%ATS{638geE;pJ>PogdxQG(E ze4Hq0`)p72o%Xsx(yF9o7EC}JnerwluOSH+Wd?k{k!!(K6cAc-%~$Op65+{qTWrpXRse}@k5fQ2j zyrHQplN{`9#=*gZYq(oA+??F1F3AkOgd;z%Q#?31kWmXLA1m6^B1yt3+iDJW<~;D> z5Pb4C0}$ZUIFaeoUNZuT@fNbka2^R&xy|jWNT{;O?4I0R(e<8B&kQnf)q0ou+`hj~I`%VlV-2 z2bvqJ0YY7NpqxsZoT+WbiiZXXWCD;2Cz}PI;h&_oW8_jOXDT*M-Pp z6K@8Wq2D1cfw{`tivnD3!XpL{kGIYgu+1Rgm+GTB%0b8hYlbN4r05`woGaqkHj_`( zsAN2gnr`l}H7>Y`&z}oG1K(JuV)#y*S2%t-r!JC^pFb0%RAks(NAmIm7>q%Zqsz>y zco0zDftyA1oOz z@7^V?3l1q_rYaVw8mJpDhU{M3zM7OxJ)XqToy8Iur6-T`!Q73DBT(JgoujP`S}a{l zL$4qf5e}J-BI9Ysr-&PCogxNE^VwumQyk_JU^nwBi4fe4<9FI0sPrJ~tI*Rc`yBxG zy@pFsS!FrWBR;dp;boj-_lOM^PsIcx61hluf_We&Do-Gb4J#e_0b=;Y{kU1t|pJ7nbd z<^8b!9|+J!Lk<*Omt>4=A8W7NB;@Y87S(7hvS_vKl5R>{8M1f&pRXhq*>0D!l=CB7 z2Abd3eM%O{3m}srzTQx!s57;8=5Elk?#b{#vLU938J3W2al zBrz`BPSpF}yDV@b0CmV~ur#cQ_f+EhQApz`bIF9ss~HSFCCSgVFNqWiR84$Iog2t? zw_$w(11N1^b?&%AcM+KK*(KPbE%rTZef`6uIeEE^F8KRcOc~~%f#R?0@!#4b{$^?Z z{~aU#!y#MsmrfSgZw_*?x3_WrmjQa{pG~X(vZKx${JUow{$DZw=7&8$yHm+c{|`&< zMLIWJ9|MAjc?`5P3mxT#1Av`@=m=yB0H}K2(+uG%VjYT-0%@RU;)7bGpCyhw!18sA zzCR2>ZwxbE;xbxr7270XFoICHk8zdDx*N7oI4)Bzd`OjxGj=XGmzyz@?y(embFF?J z@%LjH^tRcF3E?pezG!M}V{p}O zXQ!bL(gN4HAwTSF@~Jo0+aMrnQRV+YM=OAE+q&OwlK%G-1~hH|I1%-kqu&eE zOJW||;WP0X$a)b9NF7RR+YJ*WC~claO>0Sl%5HtPIsFpmnqso zLrms0SZq?a9At!KCs?POpo-+;osE|yZeq@(b5+{o>`r9oN8nLrb9={?=7$1jH(mL=P&7;at-T`V$CL5NHjNq;z(nqY z*}x|KfHIXyz1#c#pTmTNB_MoQ!}ZTeTZ~RoIvBmh&)DDW*IXB*bd&F;=lUw#dSHUII$j0V0b}c(9yRyG;ocwBzNvP9)g%c(cuh){E_hR;Y+VX+?eO z|9zeXsOi9yOc3_PqSg$iGEH^Zlr>Ym9o5Ychq4E=q4%;c_FAcC0aqK^QeXz?SE@M= zdrm`hBifHvDQ@X?rm8m_6M=ZS_~>GdDk?%|D8Z}4i^!)t zx4MA=P;bcwx>bbe%mlZ{BqOoN_aI$w6nw0GtQ0}x09}+9EgLG(n7TplGH?f|DCQBk zc`z)=Ltd-~-s&Pqi!r8F-cU3mPD=+&JsTWJAkZsc{aT9&`X`Y0H8_B`7zpBg`A?Sz z9wU8k{E-*9Yi6%D4PNt&02r5_!5?{!Xx!gwhetPqW?809TPok;J9m z7;XJ{pdEI)Ji2bYkDoydk-#RDh|`53#;lMH45)hum{FEdF8CZ?a^H<(NQJ*y^zjee zDYx&X_>(}>3FRE_5Y$Eu09(K$^@&SR1J`cN(R4shwN{M6xLZ%vK6h}2M*qBye{UOuYFuV8xRqE8&cP+zh;kZ0hxa3eH3T=J;>Rgej zY6>$N>TM+JLIkYgD3-K{;-%@#xz>q1BK`IO#_jB+~A& zuSk286XNLXWH1%7B4V99A+D2rn`a~RC;%m$1RtVYp`lOTDHSXO@V&w9EHUF zyIb9D84!+{nW2@%W4R3_kM`q@-VB}n%+Yxrr|9euQ*D%XcsA$ds~poLpmDg*)=}{m zmPYUW!A4_*cbKp9YNSKUz7>8PZ^Tj!OCy|&8$x(y0!4C&PL0GqMxoZT?NeISz!5=w zNz_xk42~(aJh1#cQWu-FyDO)Di8B>%rsMa2NCcM1K#{TqLg~3nH@R@6QqZUlo7}&F zLbjl2PAR4H<5ac_sS7|@UV>H9(u7pKrp zVowIIl)G?DIFfBst$AF^5e~Xlnr~k9v0i^8kx+?2$UO-grr)bQer zV2NpWcX1i0GG*wLZ-|f9J>$7S!5pHxmz~!@gyYgV$x3No&cPG*5^r4_L@|-VRrb}Ouj`w7UZN~Q& zrqKS@vaU79_R_|CSnM5dCN{Hj5klAUd5HCX{cyxHTkFNVF_ege^kjcsIZtb{z1oZL zl#WsLsdMNwm~Hu92fdE(L)e|tH>YTl(;HnrY)Maw#~}6okQbq^%Z(kMpBT~gS1v+V zHP>3UG2~Xb+rr8;FE@dCI~ks&=ONwG5B5f|Bs*ae!EOsv>=(f=dMNwXFZe(BiPp|s zp76Jk*oW}Xr2JRxApY+V=>JY2f6qeypZbX_{sPQ@aQ=Tl-=BW6ySI_B358u86q{bX_!$;Rjgx6_k;VMql>Mpbwsr6 zOwh~PLDNzdAxN4eMuV(bHwEd8JqMPfv+sfwsgd3Zb+&kEWz)SQNe7ZNi%iIOS(=t6 zKhy4=-A2vU-Ygd}H=Ayd7U@ly2qu#|IS0BR;g*&j05t6ToyPH+-k>iMnq$u_P?8l**q=V^gB z1CLLax|I1$Li>@t^vxvg&}xU!x15-`KcGiqSymq5DM^TLvn-f;GfJXswu1&Mxm7HriaZ zgo%3uuF*&f86D@*Zmfh4i&}jtLs28>ClcLe?>~*D7fMbFnb*_)h}5xj4uGh6&L?L= z7>;;rlZNSNasa1_D;v(&s0(IY?(SV{r_$VHVm=f?eEQ*=cDMss_0uZIkd`YL_+q3W z*&SFT#6s*^w598{A=_Rrn`!3a_O;{uxJrUzTRs(Vq#nj`S7=_sK_z2T+T`pp8R0y}PM`Z%@k)c~$uS83EDb z_xy&;veI41ogt6aTiuw)gv*r#T$9Go)3k?4i^WPz_#sF#`4{BdgB*>E(-}?q_2&W< zLo0Gk+7y#33q9#;f>f=W8bZtDHKCRWMv0#|(jkQMbV7hD`D?>|#G)c+nnP4)RkhQ! zE=E*C9#R#GJrwIhgPQO{L8oj+m!tV1W)@Cdgp?v``1EU9?uW`v-sVL#g}3CoAegK5Me*DUV9v0u{ELIWWK5qeR=O2Nr{69q>>PU&IyxL3yK1;jsCo-Z zRzr--J?h&?@Q2K>@lS7JBJDiEk;Wjl5`IFT1=yw+{Lb=Dgwk>nNr?(^k#x7vqQeNF zI=Mwn4yjtD({C{_diQSQKy7I)AR1hKyQXzYve$;)&r)e)A#>ks(yY0;Y__xQnYdkr zPS{(DK6r{N)sQ{mQnuXe(*}Y{Nh(1~a*9GpD(V=iRC0+Oc6&moMJ4KTjxLN@M*j~( zs2kt~V1Q(fT13e6<>8`9S>q>pn8MhGn$vHb603u*CvQ8C^)Pm8@fu=YQrR>gvxb}x zekaHXOXwsq4O$I9Pn91ebp`rSVI!DYdpwRL5Y*i>{ije1?iWa%l@pGs7#(iGO26{OR;tmN}K@E2Fu2uvX< z)}5p*vkM(4!i4*zcq66MV~3^=F?FHY=piJ%uSm52P*d9KZjjZ1P~-T_k1DG0Y)E^5 z=%9U!I62LcWHONL^UxRktSuT087k!UkR5NH^KRZ{+-SZ2O9PBE$wdAdHBU zn3=F%@dRIir#!X*h$KKnUJt#_vL+@UF z#q@ddeYQ$80))rU3it({c9!X0!+UDR<0;d?7LLokfJfa1mT^29XZ(H*WHJeeMwY|BEHzUa>O6B*SO zs2#Wn|NTcH+TS46p6zSg+6TQAej<1MQ7bABsoS24-?olT3T_{twFM3ZO#+*Q zs)1YcN**w|jVYw;Iu-O?-dij?SRX(k*52m;SHlPucrjMXM$=O3 z*oGjVH{W+k1Yfkjia&ql!&BKfbV_KwD9aRSeQeMUW!8c0lw*=mHWB6NB+HN)APW_S zUm1nHtw(EQS(b}0Fj#Q97PY~T#xH1k&MxvGI^^ye$@>Rbih7r;^eOXV})$4=jilY5!W}{q3 zTP#~!^f^J(TemN=gpb>oceEvJ383KR&30&Q2!jx1wn!J2oGB(pmumyZu`Q{T-ooZE zpFZ2*J@Fz9jlA9HPf&i6ip)#~n{L-Z;ZDSrp(upONS(8NLER7%`mr&|dLEq)a)+v*rVt@T6 zuH?FKMFuiqdiR)cVz6ni&}PIT{tv8Qdhq$WQ=4U+n9OX9EVKIM(qmrx6?e+b1$ac$ zASwD*pI8h*<2@5`AjK>ESmzRsb7BRNJVD=Fb+a^45WHK+NuT)0BcyDEJFw7T;`*5! z-PnW$$z8M57r}B}9mX(n^+sesDEPiK_+z}n5UY1*CG1^k?cn16m<98`1)(b~5$|z0 zvUztRgI@R#e2<(ML(O+#W6vil$3;r4FM2u$ksTXZPf&Q`_01P2my(9TJOte7!@UQHIu2+9~w( zQO#xz-6WrT(1M43bP*9u%fa|D!|l!9MIg;<4mWUX-%#N?^-5u)PbA()_Ka5?!Ep1; zi%w|G)B)=xLKYWPbiD09HuyAI!LxnyRr(}^Sf_jf7U%Xh z&gsGuoLK?&^p7Uk5xBzEA_OonLw3+P%9IN_-!5o?1cS&9s{!O z`|)4Xmw8QDr@M9EmT&5$$uX{!1z(l$xY@sEr#k1zQ-^su@Z-PKQOYBGK_(*f_O5^c zhg3qD5|_7_xw8iyZVw^c$2&baHRGd`;rh@#G+GG1ct0_Yj+A zj;O>=B-u7$O-$e`GQ%bV@S%zqWX#EN(moJ8@c^W_T^D5;+RW*%j!CU*w6M$pqp+Hc zyKXGzpKf^dk{$_#H`A_ohG63Cd5K)$5a_iIw|_j&fqlH`$~3FoDQSU~7JtCQhvRgL zmhUS9UK+DFe;q93cQ+J#-~kk zPt&k=!4I5FlYM$c8fEL@?l6bXSx6|UPzYi*N2e6v^vca)3NaT0L!aZqB__R^$f8Vw zD%_pM?L4rLT{jv!;zQ|Hv$6}438P4AbwWv1E5|&Lb z^znx2FsGP}<`=RqtqSa3#g`mh{Cvj#S$yB{7(gCz{B#oEW*GRBDN86OjFPU-sPA2elzO zL(>Z%hf|$QO_9LB)Bos1BfJ`?q3?SwXOA;S_zE!)$~#S}-_~(v#pMM-V0I00V}tla zC7RD#M3Tja$S?3XF1~NFS!c4A`GfNYSUg(C_?g0&b8I}-s?DCEWGYFQ;N1*!?8k(^#o&t`vdCg%ZQOOPi^9gOqZ!WclmrplMVYx*}Q|2+j=!$?tYq z@qA`)_%@Vv{ zhC@@hcgBDCyt-YMRE3-qWTX4pwQf=YJ~1(ej@nk|n?H=UCmslL!I%=Gornz7?aUpW07N4qK#1NIg13= z3@WeIXdXsAH`>x0SAKjg@qSPxifBmwl>B>B4gQLEMU?pAg;THTmt_|-5=!~6YM90R zE%fZO2=s&YjxJT1Ff&%&d_<9SlFO{tn)ZcYJP`{s?buG4Mcf?=atkr-eZ$R3mAvV4 zhla&zL6ICi_ZXpFd%(R@2q%Iq0+Ok!<* z64BiADWTqqC+?=Su3|Cjpfkea_K(h$XJVm&JJ4WYu|%Nh|M%qipilZfi$2!>wI28< zdGvpj_4EEA>s#3yf!b&_{VVIIYTSECU#iP7SI6->dda`l^Za7OtX(zT4CyZ-Th$qo z)I^zRGko!JA5mHwQ=(o1j^%s}71>qa=~qFkvwgPTH$UPbB5>XoKN+-=i?P zVV%9D$-PBJ(eI)Ts+QMPzOZp{d87aWIfzLp11VPYa2o;>vED$Ws+XP=eK$WE*tu}l ztz>?5Bu=nr9;X;PDv@Ysk)g_!_plN%x|NvV2((+S<*&R=@olfbqdN5}srVqEtrsD- zdPE45OM}MOqo*W(^jQ&IkXw)i2S>>O{L zj3;RYvej2+gogb|@p(IqXp-NpHGGraSt55NZ}PbI)zIk!K8{K76|-8bxL`J~OHEs} z1Z7~6hEovcmxzZ^Ik1zx(fVkte8jqJ3A;h}YOs7Hq+)J=T5=HUwsw8SM2WA7kjE$P z$j_%)JIcD@Ir`k!H0jgDe(1_dj7uHPNPq6KjvOag^h2c)KEd~`hvjzR0c+I>|TTRdc|f9ZD3%3`n?U*lMwLEl&9O z75T)T21f7Wp6LdRbMS7w7q+GHg@uy3Mj>~amWt-dxwAn|UW>cGrq=gynSDeP%K0`D z@WMO_c_*%u^1P0gxO4Lgg&ulzheaa(f!89|;iQ+Z1qJ0@pS70fnlXMO?OLx7|53?; z6_6+rF(zHZ>U;u~%tg27IIsnoWTso~4pn1)OBe}G?4RX|h(m_2F{zZIq3%^D(7v~X zVssTgg^3amz%A9^iUi0XdETrg#Bk>z0w%_c_GgDq)=k|esP=UUYqu!s05rx*I17gw zRhwNdD1>i}VC(=5uOrxe8|rpV*6b+WzJ6OHX*Zi-0o^8mAEuJEQo~d`zV591J=VRk zIbZ2?qA{f-Obse+;-y(H8Ra`ZPmV45)0ZrDsOtVG!XxyZ)~f@=XoyQjL*B6O$}Sa$ z#0>OEQ0Y8Ig57B97%lCdIGRFEv0DwVz;T&nWahnuR>*B-pAC(~oSB2c&cT~cx0;@l z9N=;&TIre_S#hZrxq-Lw(uV_ihw-&MlI(qV;?`0d{g| z(`cs^oTwuPKXM(XjQxRkc&N<)$TnBD&5n|@O8fb7bvttN(RH;U9$BQZc=FMx?cRyg z9eIJ~RP?UPtcI^=L%)2zA(hI(EXcKS%W#{V9pSblhkwT& z69u8lufjJE&&pw$Uwt~q!8UQZJ=u3L9n8z8R6%G)Wz=%6ru_RYZLu3>l@M@wxEr%*?E&2*zDH%`a0S`o&C%VYfv ztRXP3PVvblWUXcBrBC)kDp%%6-40uUxdY#MZ{zl-M54 zkY;c$KuWmZQpYV!m_l2FOE;E>^RCb8u@r^gLCzEQMP;NVj?iSlO{k9(^*O%n8polx zBfVgJNS(}}%H~2y^lNBJg68surFYmgkbrkaw=lp*aMz#Bp4C8sfr(>+=C9w=z~AJr zzsLyxqx_ZgTmAxCL4wX&olR{4Hipii6-%}M&S7e@@v~frceU@NEj?*2*)}ur`k|-8 zawxXB^Om{spLd4QO;}}P;iWyM#?C+Dq*E2IeNoUNVoU)$JO}dz#0iIBZ6mtSk3_N! zeCWDsA7}5ePW7}rHi5s5kd%J3fD2V$PUX(XK*j%6`?z`{8|)Y}ui!_&fXZRNJOQ0h zB(HeC+?~OGTm8iA-IlCEV}NfdfRl@_s-Eqc6KXYg_#tmV%AoiykM#yj{4TTpaxNU> zhC8#CLeH@#L$L)KWvHfmFp7FE9q&|NYi3~&#wjZ)<=CUK?mgiR7LN(5E|Sk(pEieB z_`|Tai4%v8*qy`PdisLRrn(=T3mGPh68&2cU|LB%hCh)vECgu;o_2kXXi{3 zXAdHsv{&AajzW;c*VAetI@-<^EuC_tE?3Vk<)D_h-Gb#2>NUDn`9di5M3?NdGz3Xl z#WvJgn{Nv-oVdn>(V%G()o7V#JA6qZr7N8*UA@o$=Dvz z6|o(5kl%&B%!!kwmexj|7f8ze$}A9tZ8=zMf1^KJ>ntuCFBlGn`G2Y2>e zudy3H$|L0ucjv>QK4JFWtqX;anJym}H7|=l$5hobFitS2%#DACj38(f>^ACQe5ME& z$$IsC32i=SJ!+!7dhgOJPDTk+)IJ}6G66sm8$um^hL*f5Nd7&cq&31`>vmePMC6?=1_?ZSD9vzW7;Cr_|YTU>ZxX7K?@ zez~O7W+S%cRBTp-;W1eT@eMWyKJw#H#YX4L8ioA4Ly0>(D2y;h=xy`%hUM!My0XuT zDe5S)u5%=k?=M=+SOR+AcWWaxx~RP#&KVgVSw^TuPcmn>a%CvLn!UvwL~QxAzRmyY zcFH_`D%=hwcL%V5EY5nBM>%q?{9<$BtNJR;TjJ{{Apy9aoR6DI=lG@5*0LgM4g11K zg^ae1jca>}TvB9x_ccjM5y<;Z$tN>bWyC1^Ze?ufo?O=LUXA$YeP_|V`lID%G|EGE z69NqE=&r`~SJ~?CvEzYp-NT#qzX>D%&w&s85f;RKrS9(q#!z60ccrO+{0Q%g0AGRi zns;Tpus`=LQj`TA{%boM(7kn#K@QLMzgyhAKOCfj7xw2KM)x}R82`Bw&o7K?k=(nT zdw$l!0#W{51^agrpeWZO3!oA|PwAn~uTuiuFbD6!Dd9f?LHR@HL1FFhXLm0N+-V2Y z{vPdt~cR&XmC8PXj>LH&n~esF_?t)MJtxq- z8I%(!2+B$RK#=XO4F69#|0`{v;~A(I8pZ?d{X6Yn;|XGVb`J`)hXe%$ih+U>KM+GE z`3um0)CC%4fLdr^KG5yH)BObr>XmU%3G_Mxr39*hQj$DS^QQX?%6}FH_Eds)TM|4F z=AwUy`5$eS_q0Hd3{YC2C@3xU1JU!l!1bpW-^uj9)CY!D(2kCW-}w5w&A5Jz?a$VY zdsJXoB`7LT3KaF>H(r|mFHrwd^*-SKUM>d>G5~jRUjXc9zs7yw2Uh5VQUN;-KpPoQ zK#tG$=lFU2gUJ8yrh|K-Kac#NLf0bff*_}NpH2TW{@({#AQ5QX#(zKr_)nqV0{26> zdrjadftDNMKG3|n(*&I+052)i&(4PXtNHu50Tn^7CdC6qC#nB9UC 0 && new_value.values[0].src == 'hcda') { + if (new_value && new_value.values.length > 0 && new_value.values[0].src == 'hdca') { this.current = 'collection'; this.select_collection.value(list[0]); } else { diff --git a/static/scripts/mvc/ui/ui-portlet.js b/static/scripts/mvc/ui/ui-portlet.js index fe2311e93ee..929869532ee 100644 --- a/static/scripts/mvc/ui/ui-portlet.js +++ b/static/scripts/mvc/ui/ui-portlet.js @@ -8,6 +8,7 @@ var View = Backbone.View.extend({ // defaults options optionsDefault: { + id : Utils.uuid(), title : '', icon : '', buttons : null, diff --git a/static/scripts/packed/mvc/form/form-select-content.js b/static/scripts/packed/mvc/form/form-select-content.js index bfa92e57183..588f5d337a8 100644 --- a/static/scripts/packed/mvc/form/form-select-content.js +++ b/static/scripts/packed/mvc/form/form-select-content.js @@ -1 +1 @@ -define(["utils/utils","mvc/ui/ui-misc","mvc/ui/ui-tabs","mvc/tools/tools-template"],function(c,e,b,a){history={};var d=Backbone.View.extend({initialize:function(g,p){this.app=g;this.options=p;var o=this;this.setElement('

');this.list={};var m=[];if(p.type=="data_collection"){this.mode="collection"}else{if(p.multiple){this.mode="multiple"}else{this.mode="single"}}this.current=this.mode;this.list={};var k=c.textify(p.extensions);var j="No dataset available.";if(k){j="No "+k+" dataset available."}var l="No dataset list available.";if(k){l="No "+k+" dataset collection available."}if(this.mode=="single"){m.push({icon:"fa-file-o",value:"single",tooltip:"Single dataset"});this.select_single=new e.Select.View({optional:p.optional,error_text:j,onchange:function(){o.trigger("change")}});this.list.single={field:this.select_single,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"){m.push({icon:"fa-files-o",value:"multiple",tooltip:"Multiple datasets"});this.select_multiple=new e.Select.View({multiple:true,searchable:false,error_text:j,onchange:function(){o.trigger("change")}});this.list.multiple={field:this.select_multiple,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"||this.mode=="collection"){m.push({icon:"fa-folder-o",value:"collection",tooltip:"Dataset collection"});this.select_collection=new e.Select.View({error_text:l,optional:p.optional,onchange:function(){o.trigger("change")}});this.list.collection={field:this.select_collection,type:"hdca"}}this.button_type=new e.RadioButton.View({value:this.current,data:m,onchange:function(i){o.current=i;o.refresh();o.trigger("change")}});this.$batch=$(this.template_batch());var f=_.size(this.list);var n=0;if(f>1){this.$el.append(this.button_type.$el);n=Math.max(0,_.size(this.list)*35)+"px"}for(var h in this.list){this.$el.append(this.list[h].field.$el.css({"margin-left":n}))}this.$el.append(this.$batch.css({"margin-left":n}));this.update(p.data);if(this.options.value!==undefined){this.value(this.options.value)}this.refresh();this.on("change",function(){if(p.onchange){p.onchange(o.value())}})},wait:function(){for(var f in this.list){this.list[f].field.wait()}},unwait:function(){for(var f in this.list){this.list[f].field.unwait()}},update:function(h){var f=this;function g(m,j){if(m){var n=[];for(var k in j){var l=j[k];n.push({label:l.hid+": "+l.name,value:l.id});history[l.id+"_"+l.src]=l}m.update(n)}}g(this.select_single,h.hda);g(this.select_multiple,h.hda);g(this.select_collection,h.hdca)},value:function(j){if(j!==undefined){if(j&&j.values){try{var m=[];for(var h in j.values){m.push(j.values[h].id)}if(j&&j.values.length>0&&j.values[0].src=="hcda"){this.current="collection";this.select_collection.value(m[0])}else{if(this.mode=="multiple"){this.current="multiple";this.select_multiple.value(m)}else{this.current="single";this.select_single.value(m[0])}}}catch(l){console.debug("tools-select-content::value() - Skipped.")}}else{for(var h in this.list){this.list[h].field.value(null)}}}this.refresh();var k=this._select().value();if(k===null){return null}if(!(k instanceof Array)){k=[k]}if(k.length===0){return null}var f={batch:this._batch(),values:[]};for(var h in k){var g=_.findWhere(history,{id:k[h],src:this.list[this.current].type});if(g){f.values.push(g)}else{return null}}f.values.sort(function(n,i){return n.hid-i.hid});return f},refresh:function(){this.button_type.value(this.current);for(var g in this.list){var f=this.list[g].field.$el;if(this.current==g){f.show()}else{f.hide()}}if(this._batch()){this.$batch.show()}else{this.$batch.hide()}},_select:function(){return this.list[this.current].field},_batch:function(){if(this.current=="collection"){var f=_.findWhere(history,{id:this._select().value(),src:"hdca"});if(f&&f.map_over_type){return true}}if(this.current!="single"){if(this.mode=="single"){return true}}return false},template_batch:function(){return'
This is a batch mode input field. A separate job will be triggered for each dataset.
'}});return{View:d}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-misc","mvc/ui/ui-tabs","mvc/tools/tools-template"],function(c,e,b,a){history={};var d=Backbone.View.extend({initialize:function(g,p){this.app=g;this.options=p;var o=this;this.setElement('
');this.list={};var m=[];if(p.type=="data_collection"){this.mode="collection"}else{if(p.multiple){this.mode="multiple"}else{this.mode="single"}}this.current=this.mode;this.list={};var k=c.textify(p.extensions);var j="No dataset available.";if(k){j="No "+k+" dataset available."}var l="No dataset list available.";if(k){l="No "+k+" dataset collection available."}if(this.mode=="single"){m.push({icon:"fa-file-o",value:"single",tooltip:"Single dataset"});this.select_single=new e.Select.View({optional:p.optional,error_text:j,onchange:function(){o.trigger("change")}});this.list.single={field:this.select_single,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"){m.push({icon:"fa-files-o",value:"multiple",tooltip:"Multiple datasets"});this.select_multiple=new e.Select.View({multiple:true,searchable:false,error_text:j,onchange:function(){o.trigger("change")}});this.list.multiple={field:this.select_multiple,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"||this.mode=="collection"){m.push({icon:"fa-folder-o",value:"collection",tooltip:"Dataset collection"});this.select_collection=new e.Select.View({error_text:l,optional:p.optional,onchange:function(){o.trigger("change")}});this.list.collection={field:this.select_collection,type:"hdca"}}this.button_type=new e.RadioButton.View({value:this.current,data:m,onchange:function(i){o.current=i;o.refresh();o.trigger("change")}});this.$batch=$(this.template_batch());var f=_.size(this.list);var n=0;if(f>1){this.$el.append(this.button_type.$el);n=Math.max(0,_.size(this.list)*35)+"px"}for(var h in this.list){this.$el.append(this.list[h].field.$el.css({"margin-left":n}))}this.$el.append(this.$batch.css({"margin-left":n}));this.update(p.data);if(this.options.value!==undefined){this.value(this.options.value)}this.refresh();this.on("change",function(){if(p.onchange){p.onchange(o.value())}})},wait:function(){for(var f in this.list){this.list[f].field.wait()}},unwait:function(){for(var f in this.list){this.list[f].field.unwait()}},update:function(h){var f=this;function g(m,j){if(m){var n=[];for(var k in j){var l=j[k];n.push({label:l.hid+": "+l.name,value:l.id});history[l.id+"_"+l.src]=l}m.update(n)}}g(this.select_single,h.hda);g(this.select_multiple,h.hda);g(this.select_collection,h.hdca)},value:function(j){if(j!==undefined){if(j&&j.values){try{var m=[];for(var h in j.values){m.push(j.values[h].id)}if(j&&j.values.length>0&&j.values[0].src=="hdca"){this.current="collection";this.select_collection.value(m[0])}else{if(this.mode=="multiple"){this.current="multiple";this.select_multiple.value(m)}else{this.current="single";this.select_single.value(m[0])}}}catch(l){console.debug("tools-select-content::value() - Skipped.")}}else{for(var h in this.list){this.list[h].field.value(null)}}}this.refresh();var k=this._select().value();if(k===null){return null}if(!(k instanceof Array)){k=[k]}if(k.length===0){return null}var f={batch:this._batch(),values:[]};for(var h in k){var g=_.findWhere(history,{id:k[h],src:this.list[this.current].type});if(g){f.values.push(g)}else{return null}}f.values.sort(function(n,i){return n.hid-i.hid});return f},refresh:function(){this.button_type.value(this.current);for(var g in this.list){var f=this.list[g].field.$el;if(this.current==g){f.show()}else{f.hide()}}if(this._batch()){this.$batch.show()}else{this.$batch.hide()}},_select:function(){return this.list[this.current].field},_batch:function(){if(this.current=="collection"){var f=_.findWhere(history,{id:this._select().value(),src:"hdca"});if(f&&f.map_over_type){return true}}if(this.current!="single"){if(this.mode=="single"){return true}}return false},template_batch:function(){return'
This is a batch mode input field. A separate job will be triggered for each dataset.
'}});return{View:d}}); \ No newline at end of file diff --git a/static/scripts/packed/mvc/ui/ui-portlet.js b/static/scripts/packed/mvc/ui/ui-portlet.js index 468549c447c..4faea93a82a 100644 --- a/static/scripts/packed/mvc/ui/ui-portlet.js +++ b/static/scripts/packed/mvc/ui/ui-portlet.js @@ -1 +1 @@ -define(["utils/utils"],function(a){var b=Backbone.View.extend({visible:false,optionsDefault:{title:"",icon:"",buttons:null,body:null,scrollable:true,nopadding:false,operations:null,placement:"bottom",cls:"ui-portlet",operations_flt:"right"},$title:null,$content:null,$buttons:null,$operations:null,$header:null,initialize:function(e){this.options=a.merge(e,this.optionsDefault);this.setElement(this._template(this.options));this.$content=this.$el.find(".content");this.$title=this.$el.find(".portlet-title-text");this.$header=this.$el.find(".portlet-header");var d=this.$el.find(".portlet-content");if(this.options.nopadding){d.css("padding","0px");this.$content.css("padding","0px")}this.$buttons=$(this.el).find(".buttons");if(this.options.buttons){var c=this;$.each(this.options.buttons,function(f,g){g.$el.prop("id",f);c.$buttons.append(g.$el)})}else{this.$buttons.remove()}this.$operations=$(this.el).find(".portlet-operations");if(this.options.operations){var c=this;$.each(this.options.operations,function(f,g){g.$el.prop("id",f);c.$operations.append(g.$el)})}if(this.options.body){this.append(this.options.body)}},append:function(c){this.$content.append(c)},content:function(){return this.$content},show:function(){this.$el.fadeIn("fast");this.visible=true},hide:function(){this.$el.fadeOut("fast");this.visible=false},enableButton:function(c){this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(c){this.$buttons.find("#"+c).prop("disabled",true)},hideOperation:function(c){this.$operations.find("#"+c).hide()},showOperation:function(c){this.$operations.find("#"+c).show()},setOperation:function(e,d){var c=this.$operations.find("#"+e);c.off("click");c.on("click",d)},title:function(d){var c=this.$title;if(d){c.html(d)}return c.html()},_template:function(d){var c='
';if(d.title){c+='
';if(d.icon){c+=' '}c+=''+d.title+"
"}c+='
';if(d.placement=="top"){c+='
'}c+='
';if(d.placement=="bottom"){c+='
'}c+="
";return c}});return{View:b}}); \ No newline at end of file +define(["utils/utils"],function(a){var b=Backbone.View.extend({visible:false,optionsDefault:{id:a.uuid(),title:"",icon:"",buttons:null,body:null,scrollable:true,nopadding:false,operations:null,placement:"bottom",cls:"ui-portlet",operations_flt:"right"},$title:null,$content:null,$buttons:null,$operations:null,$header:null,initialize:function(e){this.options=a.merge(e,this.optionsDefault);this.setElement(this._template(this.options));this.$content=this.$el.find(".content");this.$title=this.$el.find(".portlet-title-text");this.$header=this.$el.find(".portlet-header");var d=this.$el.find(".portlet-content");if(this.options.nopadding){d.css("padding","0px");this.$content.css("padding","0px")}this.$buttons=$(this.el).find(".buttons");if(this.options.buttons){var c=this;$.each(this.options.buttons,function(f,g){g.$el.prop("id",f);c.$buttons.append(g.$el)})}else{this.$buttons.remove()}this.$operations=$(this.el).find(".portlet-operations");if(this.options.operations){var c=this;$.each(this.options.operations,function(f,g){g.$el.prop("id",f);c.$operations.append(g.$el)})}if(this.options.body){this.append(this.options.body)}},append:function(c){this.$content.append(c)},content:function(){return this.$content},show:function(){this.$el.fadeIn("fast");this.visible=true},hide:function(){this.$el.fadeOut("fast");this.visible=false},enableButton:function(c){this.$buttons.find("#"+c).prop("disabled",false)},disableButton:function(c){this.$buttons.find("#"+c).prop("disabled",true)},hideOperation:function(c){this.$operations.find("#"+c).hide()},showOperation:function(c){this.$operations.find("#"+c).show()},setOperation:function(e,d){var c=this.$operations.find("#"+e);c.off("click");c.on("click",d)},title:function(d){var c=this.$title;if(d){c.html(d)}return c.html()},_template:function(d){var c='
';if(d.title){c+='
';if(d.icon){c+=' '}c+=''+d.title+"
"}c+='
';if(d.placement=="top"){c+='
'}c+='
';if(d.placement=="bottom"){c+='
'}c+="
";return c}});return{View:b}}); \ No newline at end of file