From 112db57dd1a395eccc326b1bbc31404570325ac8 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 20 Apr 2010 16:59:31 -0700 Subject: [PATCH] Change name of MapPoint property from state to region to avoid conflict with asset state. Add template i18n. Fixes bugs 11531, 11532 --- docs/changelog/7.x.x.txt | 2 ++ ...ap_map-templates_default-edit-map-point.wgpkg | Bin 0 -> 1228 bytes ...ap_map-templates_default-map-point-view.wgpkg | Bin 0 -> 1229 bytes docs/upgrades/upgrade_7.9.2-7.9.3.pl | 12 ++++++++++++ lib/WebGUI/Asset/MapPoint.pm | 2 +- 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg create mode 100644 docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 606f20d07..c813b87bc 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -13,6 +13,8 @@ - fixed #11525: Paste assets inside CS - added #620: Add buttons to the GalleryAlbum edit view so users can rotate photos by 90 deg (Bernd Kalbfuß-Zimmermann) - fixed #11530: account deactivation not working (United Knowledge) + - fixed #11531: MapPoint property conflict + - fixed #11532: MapPoint, no i18n 7.9.2 - added: Workflow to extend recurring Calendar events 2 years from the diff --git a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..822fec147fb4a42fdd67ece571b021720d3b249d GIT binary patch literal 1228 zcmV;-1T*^|iwFP!00000|Ls>@Z`(E$^>crPpr;LpV@dvsy)1z1B#VnCGn!;+x@-n5 z(H0w-)JQ6hJM_Qrl9H?s+mjy>U>G7Gv0lb9GpI{l~JbZns^lS(e>xTk6xY zTdi8nSU*z)fw|Z{tQG~2UY!2? z7wCU!NM~(l{~i6+at^-=MqemVpzL&Dzjy3^r`hb3_P^zHVgI3;um8N({vW=6>Mt?F z-|yfOni4O<07*PSQXTq7Q6xX%{2u|T2vtEVLt z4G+&y6v#UEh^(ujkP#{~W+Vib2`jtst=qo_AMkxQa%jDNcUpfx7-U!?#+*qeS7BV7 z+}eq_AfAV*PQ}hb=A1?0$UB4C^-!+JX^#5$V~;!;F6@{1`N3SyCo0`b6pmH059Y}O zJ(h4NCQpbPGsYJaAIglm`aM8X9Gv_)q7rk8Bw-WHihSTi{(rZ zP9Cwfur86SWY&tcC}bs_zG(aLaXg2;tz`U0!Xfk0f>-32fGbH|7E#IfU3d(xBn^E= z_smm6D+y=ldB0Kuu#yZf5DE69)6h!7M72lW*ar>SkGU9=pQ3ntXNv&ICzQHo1AoM)wx28SkvzC^q1RFzpqbDzkic>QAP=k8BW~C%sLfI zcP(kZlA-khANq*SxA~0nr%UFM8HugJgoe{TvYb|XQ$l|uICh+F#;(;&uje$Dc|!@U z0s3NS<;;-ck%U)F!c4B#NF9`$ga{Rhra@eV+z3)SdQHB?1CDi+E1g*N;4@e>gsIj3naux)d|62a)#=OHUNbm(ylkTwK*njF3G*>XhB!OY?U=1NZCFp3bl zaph9CXlN5%_b8aUd=<*^mbp`B&3X{C!e2`+nYgQwn5*8!5=0h^G)10b;c^lx7cSv9 z95W4p-Bu1+f|s2zMGs=;I_*Qz6IK>PDVs9R1}pQg1s zr6FHP*cdYy3k>B*rCG|>lSU0=_b8zg1KOAaw3L>ai)NAXo}=dyXWj);)ETshBq#xk z`kq3yjF*r*^t!woiCmY(TB3Qh~w6 z|0R{m+Be@#b?XJYUm3w$N>qg0+Y|e}VgL66FI?IGRx|W!j_Bs|U(dDwyU(BcHdgre zl^8;o!!%0(hYx^r5RFraIdh$k^Y=eHO3yfYAOj6iLK_)--s)ei( z!y(8MUYF90Ak6Di1ZO5PU<~pyYJM;s&V%6Yc+yUQU;l8_KK&~k8C%5qlyJfqSRZ&Jhmg87HGdN&~ zi@bm{rf~Sjy=!WyboZ`RSS37cfS>F@HYON$zw|JN6ay|A4wBbO=p5RUY;TE=y|_OX z)7m{m>BwO;5^er+T|nn8O}gZpv*KQJcbl;;eJX<+6PoXvl?Fu2_gZy z>=L8}M0|pS_qV-HN437wxhbLDgcRo-Sc180h~HC(fQtT&wF2g&F~FmBur1;Kg2ZTu z3gmVDX6WyGO~L6VM2ScrB??N|4~4q)n zbk1%r&L3|GV&_CsSHX%)|gYe*>9X74LQ#eIT%;a%Jt?M>NFpS_$ z{XUqj5eMFaQ7e8`%UI#rn9O?kl+d(jpw)6LUPhLIsOVfZ{*C1wg*c*%jQ7{9T@jU` zbPKO6x+*5>_sB~77+%tFZbZwYzUuQ7qS8JVFG;qw9%bV4+_Rpgbb!L9c$5*!XU$OB zP_vOPNJ~^bzs*nON-NDU3!6I?TJl{*MLGp7S&344Xr|c$HR(R7)HVHMC+_~lwSppN^?2o&slt^Hu%!e9ZMg4D|N26Uc248djm`L4~cNRYL? rQD7a2H7b?)$-gJxUwz-kU!j*6FCBR4z)J`IR~`5Pst!Ee02TlMKeSl> literal 0 HcmV?d00001 diff --git a/docs/upgrades/upgrade_7.9.2-7.9.3.pl b/docs/upgrades/upgrade_7.9.2-7.9.3.pl index 760eed9cf..501ea26e2 100644 --- a/docs/upgrades/upgrade_7.9.2-7.9.3.pl +++ b/docs/upgrades/upgrade_7.9.2-7.9.3.pl @@ -32,6 +32,7 @@ my $session = start(); # this line required reindexSiteForDefaultSynopsis( $session ); addTopLevelWikiKeywords( $session ); +renameMapPointStateColumn( $session ); finish($session); # this line required @@ -45,6 +46,17 @@ finish($session); # this line required # print "DONE!\n" unless $quiet; #} +#---------------------------------------------------------------------------- +sub renameMapPointStateColumn { + my $session = shift; + print "\tRename the MapPoint column state to region... " unless $quiet; + + $session->db->write('ALTER TABLE MapPoint CHANGE state region char(35)'); + + print "Done.\n" unless $quiet; +} + + #---------------------------------------------------------------------------- sub addTopLevelWikiKeywords { my $session = shift; diff --git a/lib/WebGUI/Asset/MapPoint.pm b/lib/WebGUI/Asset/MapPoint.pm index b76ef7361..961bfebfe 100644 --- a/lib/WebGUI/Asset/MapPoint.pm +++ b/lib/WebGUI/Asset/MapPoint.pm @@ -99,7 +99,7 @@ sub definition { label => $i18n->get("city label"), hoverHelp => $i18n->get("city description"), }, - state => { + region => { tab => "properties", fieldType => "text", label => $i18n->get("state label"),