Skip to content

Fix OC.linkToOCS so it works as before @nextcloud/router v2.0.0 #28506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 4 commits into from
Aug 31, 2021
Merged

Fix OC.linkToOCS so it works as before @nextcloud/router v2.0.0 #28506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40d4ff3
Fix OC.linkToOCS so it works as before @nextcloud/router v2.0.0
nickvergessen Aug 19, 2021
243098a
Revert OC.linkToOCS() calls back to old behaviour
nickvergessen Aug 19, 2021
56c8641
Fix mountsfilelist to do the v1 call
nickvergessen Aug 20, 2021
d8cbb9f
Recompile
nickvergessen Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_external/js/mountsfilelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
this._setCurrentDir('/', false);

this._reloadCall = $.ajax({
url: OC.linkToOCS('apps/files_external/api/v1/mounts'),
url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts',
data: {
format: 'json'
},
Expand Down
6 changes: 3 additions & 3 deletions apps/files_external/js/statusmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ OCA.Files_External.StatusManager = {
self.isGetMountPointListRunning = true;
$.ajax({
type: 'GET',
url: OC.linkToOCS('apps/files_external/api/v1/mounts?format=json'),
url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts?format=json',
success: function (response) {
self.mountPointList = [];
_.each(response.ocs.data, function (mount) {
Expand All @@ -159,7 +159,7 @@ OCA.Files_External.StatusManager = {
},
error: function (jqxhr, state, error) {
self.mountPointList = [];
OC.Notification.show(t('files_external', 'Couldn\'t get the list of external mount points: {type}',
OC.Notification.show(t('files_external', 'Couldn\'t get the list of external mount points: {type}',
{type: error}), {type: 'error'}
);
},
Expand Down Expand Up @@ -271,7 +271,7 @@ OCA.Files_External.StatusManager = {
// check if we have a list first
if (list === undefined && !self.emptyWarningShown) {
self.emptyWarningShown = true;
OC.Notification.show(t('files_external', 'Couldn\'t fetch list of Windows network drive mount points: Empty response from server'),
OC.Notification.show(t('files_external', 'Couldn\'t fetch list of Windows network drive mount points: Empty response from server'),
{type: 'error'}
);
return;
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/js/mountsfilelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('OCA.Files_External.FileList tests', function() {
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(
OC.linkToOCS('apps/files_external/api/v1/mounts?format=json')
OC.linkToOCS('apps/files_external/api/v1') + 'mounts?format=json'
);

fakeServer.requests[0].respond(
Expand Down
6 changes: 3 additions & 3 deletions apps/files_sharing/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ OCA.Sharing.App = {
type: OCA.Files.FileActions.TYPE_INLINE,
actionHandler(fileName, context) {
const shareId = context.$file.data('shareId')
$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares/{shareId}', { shareId }))
$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares', 2) + shareId)
.success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)
}).fail(function() {
Expand All @@ -302,7 +302,7 @@ OCA.Sharing.App = {
if (context.$file.attr('data-remote-id')) {
shareBase = 'remote_shares/pending'
}
$.post(OC.linkToOCS('apps/files_sharing/api/v1/' + shareBase + '/{shareId}', { shareId }))
$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending', 2) + shareId)
.success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)
}).fail(function() {
Expand Down Expand Up @@ -333,7 +333,7 @@ OCA.Sharing.App = {
}

$.ajax({
url: OC.linkToOCS('apps/files_sharing/api/v1/' + shareBase + '/{shareId}', { shareId }),
url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId,
type: 'DELETE',
}).success(function(result) {
context.fileList.remove(context.fileInfoModel.attributes.name)
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions apps/files_sharing/js/sharedfilelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
var promises = []

var deletedShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/deletedshares'),
url: OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'deletedshares',
/* jshint camelcase: false */
data: {
format: 'json',
Expand All @@ -209,7 +209,7 @@
}

var pendingShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/shares/pending'),
url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + 'pending',
/* jshint camelcase: false */
data: {
format: 'json'
Expand All @@ -221,7 +221,7 @@
}

var pendingRemoteShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares/pending'),
url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares', 2) + 'pending',
/* jshint camelcase: false */
data: {
format: 'json'
Expand All @@ -233,7 +233,7 @@
}

var shares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/shares'),
url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
/* jshint camelcase: false */
data: {
format: 'json',
Expand All @@ -247,7 +247,7 @@
}

var remoteShares = {
url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares'),
url: OC.linkToOCS('apps/files_sharing/api/v1') + 'remote_shares',
/* jshint camelcase: false */
data: {
format: 'json',
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
OC.Settings = OC.Settings || {};
OC.Settings.Apps = OC.Settings.Apps || {
rebuildNavigation: function() {
$.getJSON(OC.linkToOCS('core/navigation/apps?format=json')).done(function(response){
$.getJSON(OC.linkToOCS('core/navigation', 2) + 'apps?format=json').done(function(response){
if(response.ocs.meta.status === 'ok') {
var addedApps = {};
var navEntries = response.ocs.data;
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/js/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ OC.Settings = _.extend(OC.Settings, {
if ($elements.length > 0) {
// Let's load the data and THEN init our select
$.ajax({
url: OC.linkToOCS('cloud/groups/details'),
url: OC.linkToOCS('cloud/groups', 2) + 'details',
dataType: 'json',
success: function(data) {
var results = [];
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/js/settings/personalInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ window.addEventListener('DOMContentLoaded', function () {
user = OC.getCurrentUser();

$.ajax({
url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
url: OC.linkToOCS('cloud/users', 2) + user['uid'],
method: 'PUT',
data: {
key: 'language',
Expand All @@ -248,7 +248,7 @@ window.addEventListener('DOMContentLoaded', function () {
user = OC.getCurrentUser();

$.ajax({
url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
url: OC.linkToOCS('cloud/users', 2) + user.uid,
method: 'PUT',
data: {
key: 'locale',
Expand Down
2 changes: 1 addition & 1 deletion core/js/dist/login.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/js/dist/login.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading