mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2010-04-21 10:59 pm

[dw-free] Entryprops displays xpost and xpostdetails wrong

[commit: http://hg.dwscoalition.org/dw-free/rev/f3b4f72cb8b5]

http://bugs.dwscoalition.org/show_bug.cgi?id=2517

Fix entryprops display of crosspost entry properties.

Patch by [personal profile] afuna.

Files modified:
  • htdocs/admin/entryprops.bml
--------------------------------------------------------------------------------
diff -r c4507f696f71 -r f3b4f72cb8b5 htdocs/admin/entryprops.bml
--- a/htdocs/admin/entryprops.bml	Wed Apr 21 22:56:22 2010 +0000
+++ b/htdocs/admin/entryprops.bml	Wed Apr 21 22:59:20 2010 +0000
@@ -81,11 +81,16 @@ body<=
             $props{$prop} = LJ::mysql_time($props{$prop}) if $p->{des} =~ /unix/i;
             
             # render xpost prop into human readable form
-            if ( $prop eq "xpost" ) {
-                my %external_accounts_map = map { $_->siteid => $_->servername }  DW::External::Account->get_external_accounts(  $entry->poster );
+            if ( $prop eq "xpost" || $prop eq "xpostdetail" ) {
+                my %external_accounts_map = map { $_->acctid => $_->servername } DW::External::Account->get_external_accounts( $entry->poster );
                 my %xpost_map = %{ DW::External::Account->xpost_string_to_hash( $props{$prop} ) };
-                $props{$prop} = join ", ", map { ( $external_accounts_map{$_} || "unknown" ) . " => $xpost_map{$_}" } keys %xpost_map;
-                $p->{des} .= " (site name => itemid)";
+                if ( $prop eq "xpost" ) {
+                    $props{$prop} = join ", ", map { ( $external_accounts_map{$_} || "unknown" ) . " => $xpost_map{$_}" } keys %xpost_map;
+                    $p->{des} .= " (site name => itemid)";
+                } else {
+                    $props{$prop} = join ", ", map { ( $external_accounts_map{$_} || "unknown" ) . " => { $xpost_map{$_}->{itemid}, $xpost_map{$_}->{url} }" } keys %xpost_map;
+                    $p->{des} .= " (site name => { itemid, url })";
+                }
             }
 
             $extra = "<br /><small>$p->{des}</small>";
--------------------------------------------------------------------------------