From 27a76cd9a368be43c73894f039634e8a6183551b Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Tue, 19 Aug 2008 17:36:17 +0000 Subject: [PATCH] fixed: Back to Site link in asset manager points to wrong location fixed: Some import node folders have invalid template --- docs/changelog/7.x.x.txt | 2 ++ .../packages-7.5.21/6.99.2_new_templates.wgpkg | Bin 0 -> 704 bytes .../packages-7.5.21/7.0.3_new_templates.wgpkg | Bin 0 -> 698 bytes .../packages-7.5.21/7.0.7_new_templates.wgpkg | Bin 0 -> 697 bytes .../packages-7.5.21/7.3.0_new_templates.wgpkg | Bin 0 -> 695 bytes .../packages-7.5.21/7.3.9_new_templates.wgpkg | Bin 0 -> 698 bytes docs/upgrades/upgrade_7.5.20-7.5.21.pl | 15 +++++++++++++++ lib/WebGUI/Content/AssetManager.pm | 1 + 8 files changed, 18 insertions(+) create mode 100644 docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg create mode 100644 docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg create mode 100644 docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg create mode 100644 docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg create mode 100644 docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 05c6e3c75..901ef6a0a 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,6 @@ 7.5.21 + - fixed: Back to Site link in asset manager points to wrong location + - fixed: Some import node folders have invalid template - fixed: Scheduled workflows based on day of week run on wrong day - improved debug messages for sql queries - fixed: Custom library directories don't override WebGUI core modules diff --git a/docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/6.99.2_new_templates.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..f1bebf256a9473e898d7ec5dc15efdcf3b2896cd GIT binary patch literal 704 zcmV;x0zds9iwFSf?y5)t1MQUCPUA2ThI`FZM7?HFk~S&nU7;L`P`4`zXti1)H<_lU zscqQ~C9HV&b&?*^1G`)xR$9$>(L-iD8UOR!wrz0i)o0K+dQ_a%K9any-)t7&E#E7? zZMXcN|MFUP&2enc^?bkKIW^mHeWz8k><{hY4N|3vw5(b@WnBCr&!mmVpV83g^6S8| zth&-%k{Ie%+xqeIuy`aS7a%nSl|L=g^2ZTXA|ct3>ZC}oJN3h5ER;YrL?>AhXsiPX zQTpszaA~5Qq8>|=WED2j>av(fM+sFEh}LTv%x zsN+_I(OCk+MKg=-3{JH9Z*SmN8)6eMo4u9Ex#Y6}k-+qJXA!7SQlTkl`$u>>AuQfI zf68ECue!Z+;ZzJ{jH3EvR%YJA=;F55Zg=vrwA=T5^a!E(an6$nwe*v;(Iqd?@oICD;>T(Kbdn}Y33$V=EXZF+guc#L`=vCw3$beWZN0V zUiUeTs`8#8qc^Un4S}5IvDXSbx4BLdh4oh|6yw^Iq2d}LDJx!e^Zp~3uYEmu{nz(C mf*=TjAP9mW2!bF8f*=TjAP9mW2!bI055EC`lQ=>EC;$L;MqRN0 literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.0.3_new_templates.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..bc9775a14e5353e1943821bb811bc2c7385dfced GIT binary patch literal 698 zcmV;r0!95FiwFSf?y5)t1MQSsPunmQ$9d*cM14jmX`6KITe%d7WR)qCsr73ex`&N>Q{=sdsp*V1 z{aQLvbxz|L*k?6FeRhmh2oqWiVG) z&E2|hD*7=xQI}*|dJbW9cGK^4y2VsFogp7RLS!C#JdHuFqV!UVb{5Vh%$#t07W0=&7n@E3j+&v&_@*)+F(TN0UYO zUTv-oY`0tOw%@8(!X*^K;p}8_lDxXt_5#msG}mNDqRDa+l@|V8Ev-+LQ^X>f3q9DC zi6rwRcT;aR7@l2RTm|Cvq<5>5Ryyrgi@DB~`S8}UHn&7K6=O02ZN`zN`KE{6>n@#9 zRbDb=^vd0|)*#Ps`VHT0RT?C$@Rwb%<63V+MKnTEWq{R&5ClOG g1VIo4K@bE%5ClOG1VIo4L6HB7-xpry762#!00+ulxBvhE literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.0.7_new_templates.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..730d36683ef9801c2f8a9e6f41b67f40a8224e8e GIT binary patch literal 697 zcmV;q0!IBGiwFSf?y5)t1MQSqZ{jcz$9e9jh_(aIVr5+cx}jt(&tZt zOJnWWd@RqhmD#jb&y$Hf%BUJcvW{giyQ3`OGwa~44XQ8$Q*<{SpD~a_1+trL7XnXO zk}Dv|fTX*DL@CgVpp)q}={4oF)9Fo4)9mZ;mYzrHI#Vt)>lYrmN8!CG@?OK#bVi$g zt(>U3qDca5yL77hl54ID0o$fWs;C*pDT&80pi|(vo^K*>D_*JOx#%Y637uQLMx`&h z$Y8K2X0e<8i8k-<20^tTHU>%cP-YjBPy0jy)7zCLpkhgdrkw4c;OUsKbno~ngN3^4 z?#_Kv(T~xI>XGT(^A4iRVYl7xlv8Q9?|Ae8v3a=QSpsq$rB_n4vv7Jaa|XM!ShVbx z!fdx?6DoRK(-Doya(~sWPl4rww|%DUL~f;3C&HYe$EudCz;5XCJkPPWA&F}qPnO+# zwYfI1)e2iJKWtROC6vP9>}+|GyoT5E0&}T0H)KcR$!Zdn7XDo=;pfUJVzDfQ?(fS) z(nXSQ7oVbR_WkmyF*@r$55*VO>yA3rVr~j$KD=|R%`MT%#F#{&%{a2G*!Hk{-KR6E z=9dhKUb&k#8szz55SkuU1SqWVS6#5<+H6BbG(u8lKXvo=16Rhr9K8JNOCLcH1VIo4 fK@bE%5ClOG1VIo4K@bE%kpGI`POesc04M+eAkJnJ literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.3.0_new_templates.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..72e752ddc5568cda1737912227a25412c8618289 GIT binary patch literal 695 zcmV;o0!aNIiwFSf?y5)t1MQSsZ`v>v$9e9jhvgR(A-cktG)>4P2QUQN zvYpaw>UW=GZsF3c4^<~k=l1}K&n3s_{B7U25P$RA49})o@XA|Kl5E6;K1oMeYpsts$k_Tt7*n zto7XG<5`++%(k^=nM`KGl<5g1+gJ{ZKI4g4I0t`g(77F$W{2s-f`jU5PG&{^Y7J%;bl=Fn4K9NqqN*#ytHE?}L8kZHOqoiZUvySK^9Q!bfq}X0jIsUN zI5B<8k_7mE=}dQ&Fv8>#_DzpWGdqk+8c(3h<{&b&+(hV?yv9mo@-Def*wRXBrM{Rv zh3=}D)owZ$#=iSIgyn+x1QatpmEI^Z?@$HY>{ph6jun%J34VNnmlMjzN5{`NtkhNY z5AK_ieymP(o6eV>eHeb~-L+ch#Z+3Yz8Fp+whuQVO+am<%tnfC7G4_`UiWYotCoFb zusCeljLEhzY{X)^-d}m^bKqI`b)P9ZkvVBqskCS4v8-h$um|>YnWs*6B=K3qvvv1g zY_1DzHlt=Uh-#&91%+?~zgnLpQX@?g5m|k8o zboj#Ew9_CG293}sQLuHAPWYQHxN+^ap(Glq7RGZVxLc*|MjJhAP9mW2!bF8 df*=TjAP9mW2!bF8f*{C$#cx|9V!Qw-006z#TiE~r literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg b/docs/upgrades/packages-7.5.21/7.3.9_new_templates.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..28bc6346843ba8d1765eba171d630d5956245313 GIT binary patch literal 698 zcmV;r0!95FiwFSf?y5)t1MQSsPunmQ$NS8ui2BS>(l+VRx58jBMps0ENz+uh$ssjO zZOe8jVdA^bae7HFY&;+)P3QN}CO(%OpYyj}*WkI!-|*wXz2dC)mK1q|R?Ggk1K<9; zjq<&C^39s(xxRS_n!ZsBnsREd=21FBQ&Uia$z3tJ?CXowGUYiO+pBi#H2_ zM=i-Ika$3n?LeXw=y{NP+48<+kLL+>N%u?K`aUA6aks-L5>47S0hH*rqF%0Mwc&5uu1a8GEkvtP;@o`K`tJkRX zMdv9D=Ecl+(?8Va-CZN77R1INslJx!iR9Bhk-+q3WihBoQlTklyC--wCM?-Ge#&63 zuDZK*-&FKtbfS7>T6*5X==1eir_(K_(&^mt(LF@w;e@9#$W@eHO3}{3>A}nyY|moe zvKtDs?Uqfb=y6T&XhatKt8RS?EE~M;GesvdE3G;a<_tYlwQL1;MW4z%O>a#SUwJfH zbnnIH+Q2YuhoRqYRKg_`!r|=G;v{(uFZ2R)tFFtAM3dztDlPoGTH2L40gGfVbbnVS zlFX9~&o4$Nq0$S}OJ`J- zmkb%ba5t?r$ZLD8APD@{%1Kz^FS}sJwcdt`XoRH9e(LJ=2d;>H-h2Mnmp+0Z2!bF8 gf*=TjAP9mW2!bF8f*=TjApaG=0Z3AwrT{1a0IXnew($session, $assetId); + if ($asset->getChildCount == 0) { + $asset->purge; + } + } + print "Done.\n" unless $quiet; +} + + #---------------------------------------------------------------------------- # Describe what our function does #sub exampleFunction { diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 6951d5be2..741f6208b 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -238,6 +238,7 @@ sub handler { my ( $session ) = @_; if ( $session->form->get( 'op' ) eq 'assetManager' && getCurrentAsset( $session ) ) { + $session->asset(getCurrentAsset($session)); return $session->privilege->noAccess unless getCurrentAsset( $session )->canEdit;