Browse Source

Merge pull request #21638 from owncloud/degrade-well-known-url-check

Show the well-known URL check as info instead of error
tags/v9.0beta1
Thomas Müller 8 years ago
parent
commit
0c0829fbc7
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      core/js/setupchecks.js
  2. 1
    1
      core/js/tests/specs/setupchecksSpec.js

+ 1
- 1
core/js/setupchecks.js View File

var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL'); var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL');
messages.push({ messages.push({
msg: t('core', 'Your web server is not set up properly to resolve "{url}". Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }), msg: t('core', 'Your web server is not set up properly to resolve "{url}". Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }),
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
type: OC.SetupChecks.MESSAGE_TYPE_INFO
}); });
} }
deferred.resolve(messages); deferred.resolve(messages);

+ 1
- 1
core/js/tests/specs/setupchecksSpec.js View File

async.done(function( data, s, x ){ async.done(function( data, s, x ){
expect(data).toEqual([{ expect(data).toEqual([{
msg: 'Your web server is not set up properly to resolve "/.well-known/caldav/". Further information can be found in our <a target="_blank" href="http://example.org/admin-setup-well-known-URL">documentation</a>.', msg: 'Your web server is not set up properly to resolve "/.well-known/caldav/". Further information can be found in our <a target="_blank" href="http://example.org/admin-setup-well-known-URL">documentation</a>.',
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
type: OC.SetupChecks.MESSAGE_TYPE_INFO
}]); }]);
done(); done();
}); });

Loading…
Cancel
Save