Skip to content

Commit 6b6dafb

Browse files
committed
MOBILE-1902 wiki: Clean service from siteId retrieving
1 parent 6534fce commit 6b6dafb

File tree

1 file changed

+1
-25
lines changed
  • www/addons/mod/wiki/services

1 file changed

+1
-25
lines changed

www/addons/mod/wiki/services/wiki.js

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ angular.module('mm.addons.mod_wiki')
111111
* @return {Promise} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
112112
*/
113113
self.isPluginEnabled = function(siteId) {
114-
siteId = siteId || $mmSite.getId();
115-
116114
return $mmSitesManager.getSite(siteId).then(function(site) {
117115
return site.wsAvailable('mod_wiki_get_wikis_by_courses') &&
118116
site.wsAvailable('mod_wiki_get_subwikis') &&
@@ -148,8 +146,6 @@ angular.module('mm.addons.mod_wiki')
148146
* @return {Promise} Promise resolved when the wiki is retrieved.
149147
*/
150148
self.getWiki = function(courseId, id, paramName, siteId) {
151-
siteId = siteId || $mmSite.getId();
152-
153149
return $mmSitesManager.getSite(siteId).then(function(site) {
154150
var params = {
155151
courseids: [courseId]
@@ -298,8 +294,6 @@ angular.module('mm.addons.mod_wiki')
298294
* @return {Promise} Promise resolved with wiki subwikis.
299295
*/
300296
self.getSubwikis = function(wikiId, siteId) {
301-
siteId = siteId || $mmSite.getId();
302-
303297
return $mmSitesManager.getSite(siteId).then(function(site) {
304298
var params = {
305299
wikiid: wikiId
@@ -333,8 +327,6 @@ angular.module('mm.addons.mod_wiki')
333327
* @return {Promise} Promise resolved with wiki subwiki pages.
334328
*/
335329
self.getSubwikiPages = function(wikiId, groupId, userId, sortBy, sortDirection, includeContent, siteId) {
336-
siteId = siteId || $mmSite.getId();
337-
338330
return $mmSitesManager.getSite(siteId).then(function(site) {
339331
groupId = groupId || -1;
340332
userId = userId || 0;
@@ -378,8 +370,6 @@ angular.module('mm.addons.mod_wiki')
378370
* @return {Promise} Promise resolved with wiki subwiki files.
379371
*/
380372
self.getSubwikiFiles = function(wikiId, groupId, userId, siteId) {
381-
siteId = siteId || $mmSite.getId();
382-
383373
return $mmSitesManager.getSite(siteId).then(function(site) {
384374
groupId = groupId || -1;
385375
userId = userId || 0;
@@ -412,8 +402,6 @@ angular.module('mm.addons.mod_wiki')
412402
* @return {Promise} Promise resolved with wiki page contents.
413403
*/
414404
self.getPageContents = function(pageId, siteId) {
415-
siteId = siteId || $mmSite.getId();
416-
417405
return $mmSitesManager.getSite(siteId).then(function(site) {
418406
var params = {
419407
pageid: pageId
@@ -585,8 +573,6 @@ angular.module('mm.addons.mod_wiki')
585573
* - wserror: True if it's an error returned by the WebService, false otherwise.
586574
*/
587575
self.newPageOnline = function(title, content, subwikiId, wikiId, userId, groupId, siteId) {
588-
siteId = siteId || $mmSite.getId();
589-
590576
return $mmSitesManager.getSite(siteId).then(function(site) {
591577
var params = {
592578
title: title,
@@ -658,7 +644,6 @@ angular.module('mm.addons.mod_wiki')
658644
* @return {Promise} Promise resolved when the data is invalidated.
659645
*/
660646
self.invalidateWikiData = function(courseId, siteId) {
661-
siteId = siteId || $mmSite.getId();
662647
return $mmSitesManager.getSite(siteId).then(function(site) {
663648
return site.invalidateWsCacheForKey(getWikiDataCacheKey(courseId));
664649
});
@@ -675,7 +660,6 @@ angular.module('mm.addons.mod_wiki')
675660
* @return {Promise} Promise resolved when the data is invalidated.
676661
*/
677662
self.invalidateSubwikis = function(wikiId, siteId) {
678-
siteId = siteId || $mmSite.getId();
679663
self.clearSubwikiList(wikiId);
680664
return $mmSitesManager.getSite(siteId).then(function(site) {
681665
return site.invalidateWsCacheForKey(getWikiSubwikisCacheKey(wikiId));
@@ -693,7 +677,6 @@ angular.module('mm.addons.mod_wiki')
693677
* @return {Promise} Promise resolved when the data is invalidated.
694678
*/
695679
self.invalidateSubwikiPages = function(wikiId, siteId) {
696-
siteId = siteId || $mmSite.getId();
697680
return $mmSitesManager.getSite(siteId).then(function(site) {
698681
return site.invalidateWsCacheForKeyStartingWith(getWikiSubwikiPagesCacheKeyPrefix(wikiId));
699682
});
@@ -710,7 +693,6 @@ angular.module('mm.addons.mod_wiki')
710693
* @return {Promise} Promise resolved when the data is invalidated.
711694
*/
712695
self.invalidateSubwikiFiles = function(wikiId, siteId) {
713-
siteId = siteId || $mmSite.getId();
714696
return $mmSitesManager.getSite(siteId).then(function(site) {
715697
return site.invalidateWsCacheForKeyStartingWith(getWikiSubwikiFilesCacheKeyPrefix(wikiId));
716698
});
@@ -727,7 +709,6 @@ angular.module('mm.addons.mod_wiki')
727709
* @return {Promise} Promise resolved when the data is invalidated.
728710
*/
729711
self.invalidatePage = function(pageId, siteId) {
730-
siteId = siteId || $mmSite.getId();
731712
return $mmSitesManager.getSite(siteId).then(function(site) {
732713
return site.invalidateWsCacheForKey(getWikiPageCacheKey(pageId));
733714
});
@@ -771,8 +752,7 @@ angular.module('mm.addons.mod_wiki')
771752
* @return {Promise} Promise resolved when the files are invalidated.
772753
*/
773754
self.invalidateFiles = function(moduleId, siteId) {
774-
siteId = siteId || $mmSite.getId();
775-
return $mmFilepool.invalidateFilesByComponent($mmSite.getId(), mmaModWikiComponent, moduleId);
755+
return $mmFilepool.invalidateFilesByComponent(siteId, mmaModWikiComponent, moduleId);
776756
};
777757

778758
/**
@@ -787,8 +767,6 @@ angular.module('mm.addons.mod_wiki')
787767
*/
788768
self.logView = function(id, siteId) {
789769
if (id) {
790-
siteId = siteId || $mmSite.getId();
791-
792770
return $mmSitesManager.getSite(siteId).then(function(site) {
793771
var params = {
794772
wikiid: id
@@ -811,8 +789,6 @@ angular.module('mm.addons.mod_wiki')
811789
*/
812790
self.logPageView = function(id, siteId) {
813791
if (id) {
814-
siteId = siteId || $mmSite.getId();
815-
816792
return $mmSitesManager.getSite(siteId).then(function(site) {
817793
var params = {
818794
pageid: id

0 commit comments

Comments
 (0)