[Bps-public-commit] SD branch, master, updated. 3573e587fd426ec74ba100d5a94805cf64bc498e

[spang at bestpractical.com]

The branch, master has been updated
       via  3573e587fd426ec74ba100d5a94805cf64bc498e (commit)
       via  8ac8f7166b748313c669fc52f37cfd97df46ca4b (commit)
       via  8fcb31f9602f8d54efd2af6b25c409e69299d8fc (commit)
      from  b7cf5a3566ac3e58caeee1cded90d702b23cda38 (commit)

Summary of changes:
 lib/App/SD/CLI/Command/Log.pm         |    2 +-
 lib/App/SD/CLI/Command/Ticket/Show.pm |    5 +++--
 lib/App/SD/CLI/Dispatcher.pm          |    2 +-
 lib/App/SD/Replica/hm.pm              |    2 ++
 lib/App/SD/Server/View.pm             |    2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 8fcb31f9602f8d54efd2af6b25c409e69299d8fc
Author: Christine Spang <spang at bestpractical.com>
Date:   Tue Jul 14 13:46:39 2009 +0100

    Details command takes a bug # as well

diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index c455883..fb80734 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -88,7 +88,7 @@ on qr/^(\w+)\s+tickets?(.*)$/ => sub {
 under ticket => sub {
     # all these might possibly have IDs tacked onto the end
     on
-    qr/^((?:comment\s+)?(?:comments?|update|edit|show|display|delete|del|rm|history|claim|take|resolve|basics|close)) $Prophet::CLIContext::ID_REGEX$/i => sub {
+    qr/^((?:comment\s+)?(?:comments?|update|edit|show|details|display|delete|del|rm|history|claim|take|resolve|basics|close)) $Prophet::CLIContext::ID_REGEX$/i => sub {
         my $self = shift;
         $self->context->set_id_from_primary_commands;
         run("ticket $1", $self, @_);

commit 8ac8f7166b748313c669fc52f37cfd97df46ca4b
Author: Christine Spang <spang at bestpractical.com>
Date:   Wed Jul 15 22:27:44 2009 +0100

    display_name_for_uuid => display_name_for_replica

diff --git a/lib/App/SD/CLI/Command/Log.pm b/lib/App/SD/CLI/Command/Log.pm
index 594f6c1..4166518 100644
--- a/lib/App/SD/CLI/Command/Log.pm
+++ b/lib/App/SD/CLI/Command/Log.pm
@@ -22,7 +22,7 @@ sub handle_changeset {
                 $c->created,
                 ( $c->creator || '(unknown)' ),
                 $c->original_sequence_no,
-                $self->config->display_name_for_uuid($c->original_source_uuid)
+                $self->app_handle->display_name_for_replica($c->original_source_uuid)
                 ;
             }
 
diff --git a/lib/App/SD/CLI/Command/Ticket/Show.pm b/lib/App/SD/CLI/Command/Ticket/Show.pm
index 4d00967..03691e2 100644
--- a/lib/App/SD/CLI/Command/Ticket/Show.pm
+++ b/lib/App/SD/CLI/Command/Ticket/Show.pm
@@ -85,7 +85,7 @@ sub show_history_entry {
          $changeset->creator,
         $changeset->created,
         $changeset->original_sequence_no,
-        $self->config->display_name_for_uuid($changeset->original_source_uuid),
+        $self->app_handle->display_name_for_replica($changeset->original_source_uuid),
     
     );
 
@@ -121,7 +121,8 @@ sub show_comment {
         $content =~ s|\n\n|\n|gismx;
     }
 
-    $self->history_entry_header($creator, $created,$creation->original_sequence_no, $self->config->display_name_for_uuid($creation->original_source_uuid));
+    $self->history_entry_header($creator,
+        $created,$creation->original_sequence_no, $self->app_handle->display_name_for_replica($creation->original_source_uuid));
     print $content;
     print "\n\n";
 }
diff --git a/lib/App/SD/Replica/hm.pm b/lib/App/SD/Replica/hm.pm
index 3a34e1a..042af21 100644
--- a/lib/App/SD/Replica/hm.pm
+++ b/lib/App/SD/Replica/hm.pm
@@ -85,6 +85,8 @@ sub get_txn_list_by_date {
 
         sort { $a->{'id'} <=> $b->{'id'} }
         @{ $self->hm->search( 'TaskTransaction', task_id => $ticket ) || [] };
+    use Data::Dump qw(pp);
+    pp @txns;
 
     return @txns;
 }
diff --git a/lib/App/SD/Server/View.pm b/lib/App/SD/Server/View.pm
index 73bcd54..5dcb209 100644
--- a/lib/App/SD/Server/View.pm
+++ b/lib/App/SD/Server/View.pm
@@ -573,7 +573,7 @@ template ticket_history => sub {
                 };
                 span {
                     { class is 'original_source_uuid' };
-                    $self->app_handle->config->display_name_for_uuid($changeset->original_source_uuid);
+                    $self->app_handle->display_name_for_replica($changeset->original_source_uuid);
                 };
                 };
             };

commit 3573e587fd426ec74ba100d5a94805cf64bc498e
Merge: 8ac8f71... b7cf5a3...
Author: Christine Spang <spang at bestpractical.com>
Date:   Thu Jul 16 12:36:28 2009 +0100

    Merge branch 'master' of code.bestpractical.com:/git/sd


-----------------------------------------------------------------------