oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert the patch that checked spectre and canceled the commit if it could not talk to it

Browse source
This commit is contained in:
Colin Kuskie 2008-06-05 04:37:04 +00:00
parent 994da561a5
commit 70e50ca329
4 changed files with 1 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/WebGUI/Operation/Spectre.pm
View file

@ -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 ( )

14
lib/WebGUI/Operation/VersionTag.pm
View file

@ -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{<h1>%s</h1>\n<p>%s</p><p><a href="%s">%s</a>},
$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 = '';

2
lib/WebGUI/VersionTag.pm
View file

@ -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;
}

10
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -3935,16 +3935,6 @@ LongTruncOk=1</p>
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,