diff --git a/lib/WebGUI/Operation/Spectre.pm b/lib/WebGUI/Operation/Spectre.pm index 9c506c0e4..ec1a5cca2 100644 --- a/lib/WebGUI/Operation/Spectre.pm +++ b/lib/WebGUI/Operation/Spectre.pm @@ -42,31 +42,6 @@ sub canView { return $user->isInGroup( $session->setting->get("groupIdAdminSpectre") ); } -#---------------------------------------------------------------------------- - -=head2 getASpectre ( [$session] ) - -Get a connection to spectre. Encapsulated here so outside code can call -something that's carefully encapsulated. - -=head3 $session - -A WebGUI session variable so getASpectre can access information in -the config file. - -=cut - -sub getASpectre { - my $session = shift; - my $remote = create_ikc_client( - port=>$session->config->get("spectrePort"), - ip=>$session->config->get("spectreIp"), - name=>rand(100000), - timeout=>10 - ); - return $remote; -} - #------------------------------------------------------------------- =head2 www_spectreGetSiteData ( ) diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm index ed2801da8..a98181e6a 100644 --- a/lib/WebGUI/Operation/VersionTag.pm +++ b/lib/WebGUI/Operation/VersionTag.pm @@ -21,7 +21,6 @@ use WebGUI::International; use WebGUI::VersionTag; use WebGUI::HTMLForm; use WebGUI::Paginator; -use WebGUI::Operation::Spectre; =head1 NAME @@ -303,20 +302,7 @@ sub www_commitVersionTag { return www_manageVersions( $session ); } - # Make sure we can connect to SPECTRE - my $remote = WebGUI::Operation::Spectre::getASpectre($session); my $i18n = WebGUI::International->new($session, "VersionTag"); - if (!defined $remote) { - $session->errorHandler->warn('Unable to connect to spectre. Canceling the commit'); - my $output = sprintf qq{

%s

\n

%s

%s}, - $i18n->get('broken spectre title', 'WebGUI'), - $i18n->get('broken spectre body', 'WebGUI'), - $session->url->getBackToSiteURL(), - $i18n->get('493', 'WebGUI'); - return $session->style->userStyle($output); - } - $remote->disconnect; - # Build the page my $output = ''; diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm index 547454498..abb85e4cb 100644 --- a/lib/WebGUI/VersionTag.pm +++ b/lib/WebGUI/VersionTag.pm @@ -417,7 +417,7 @@ sub requestCommit { $self->{_data}{committedBy} = $self->session->user->userId; $self->{_data}{workflowInstanceId} = $instance->getId; $self->session->db->setRow("assetVersionTag","tagId",$self->{_data}); - $instance->start; + $instance->start; return undef; } diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 1bee7fed1..1d4dbc3ab 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -3935,16 +3935,6 @@ LongTruncOk=1

lastUpdated => 1193196211, }, - 'broken spectre title' => { - message => q{Cannot connect to Spectre}, - lastUpdated => 1202274234, - }, - - 'broken spectre body' => { - message => q{Your commit is canceled because WebGUI cannot connect to Spectre. Please fix your Spectre problem and attempt to commit again.}, - lastUpdated => 1202274246, - }, - 'SelectRichEditor formName' => { message => q{Rich Editor}, lastUpdated => 1202274234,