Skip to content

Commit

Permalink
fix(frontend):upgrade jquery version (UPC#861)
Browse files Browse the repository at this point in the history
* fix(frontend):upgrade jquery version

Issue [UPC#860]

* fix(frontend):jquery.slim.min to jquery.min

This solved this errors:
- I get an error in the firefox console: TypeError: t.fx is undefine.
- Also in chome, in the login screen: Uncaught TypeError: Cannot read property 'step' of undefined

Issue [UPC#860]
  • Loading branch information
fv3rdugo authored and frankiejol committed Nov 13, 2018
1 parent 6d67cc6 commit 671c9b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
3 changes: 2 additions & 1 deletion lib/Ravada/Domain/KVM.pm
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,10 @@ sub start {
if (!(scalar(@_) % 2)) {
%arg = @_;
}
my $remote_ip = delete $arg{remote_ip};

my $set_password=0;
my $remote_ip = delete $arg{remote_ip};
my $request = delete $arg{request};

if ($remote_ip) {
$set_password = 0;
Expand Down
22 changes: 0 additions & 22 deletions t/front/60_ldap.t
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ sub test_ldap {
#########################################################################

SKIP: {
<<<<<<< HEAD
my $ravada = Ravada->new(config => $CONFIG_FILE
, connector => connector());
$ravada->_install();
Expand All @@ -79,28 +78,7 @@ SKIP: {

if ($@ =~ /Bad credentials/) {
diag("$@\nFix admin credentials in $CONFIG_FILE");
||||||| parent of 6811de74... Feature #894 master (#897)
my $ok = 1;
$USER_DATA = LoadFile($file_test_data) if -e $file_test_data;
if (!-e $file_test_data || !$USER_DATA->{name} || !$USER_DATA->{password}) {
my $config = {
name => 'ldap.cn', password => '****'
};
warn "SKIPPED: To test Front LDAP create the file $file_test_data with\n"
.YAML::Dump($config);
$ok = 0;
=======
my $ravada = Ravada->new(config => $CONFIG_FILE
, connector => connector);
$ravada->_install();
my $ldap;

eval { $ldap = Ravada::Auth::LDAP::_init_ldap_admin() };
if ($@ =~ /Bad credentials/) {
diag("$@\nFix admin credentials in $CONFIG_FILE");
>>>>>>> 6811de74... Feature #894 master (#897)
} else {
diag("Skipped LDAP tests ".($@ or '')) if !$ldap;
}
Expand Down

0 comments on commit 671c9b6

Please sign in to comment.