Fix tabid not being in some api calls

donker · donker · commit f5b1a31c15eb · 2022-07-06T15:07:14.000+02:00
diff --git a/Server/Conference/Views/Attendee/BulkAdd.cshtml b/Server/Conference/Views/Attendee/BulkAdd.cshtml
@@ -7,7 +7,7 @@
     ConferenceModuleContext.AddEditScripts();
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Attendee/Edit.cshtml b/Server/Conference/Views/Attendee/Edit.cshtml
@@ -20,7 +20,7 @@
   userFolder = DotNetNuke.Services.FileSystem.FolderManager.Instance.GetUserFolder(user).FolderPath;
  }
 }
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Conference/Schedule.cshtml b/Server/Conference/Views/Conference/Schedule.cshtml
@@ -8,7 +8,7 @@
     ConferenceModuleContext.AddEditScripts();
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Conference/Sessions.cshtml b/Server/Conference/Views/Conference/Sessions.cshtml
@@ -8,7 +8,7 @@
     var speakers = SpeakerRepository.Instance.GetSpeakersByConference(Model.ConferenceId).OrderBy(s => s.LastName);
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Conference/SessionsSpeakers.cshtml b/Server/Conference/Views/Conference/SessionsSpeakers.cshtml
@@ -7,7 +7,7 @@
  var allSessions = Connect.Conference.Core.Repositories.SessionRepository.Instance.GetSessionsByConference(Model.ConferenceId);
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Home/Attendees.cshtml b/Server/Conference/Views/Home/Attendees.cshtml
@@ -11,7 +11,7 @@
  var currentUserStatus = ConferenceModuleContext.Security.GoingToConferenceStatus(Model.ConferenceId);
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Home/Conference.cshtml b/Server/Conference/Views/Home/Conference.cshtml
@@ -17,7 +17,7 @@
     }
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Home/ConferenceComments.cshtml b/Server/Conference/Views/Home/ConferenceComments.cshtml
@@ -9,7 +9,7 @@
  var totalComments = commentList.TotalCount;
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Home/Schedule.cshtml b/Server/Conference/Views/Home/Schedule.cshtml
@@ -132,7 +132,7 @@
  </div>
 </div>
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Session/Edit.cshtml b/Server/Conference/Views/Session/Edit.cshtml
@@ -20,7 +20,7 @@
 
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Session/Submit.cshtml b/Server/Conference/Views/Session/Submit.cshtml
@@ -11,7 +11,7 @@
     ConferenceModuleContext.AddEditScripts();
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Session/View.cshtml b/Server/Conference/Views/Session/View.cshtml
@@ -14,7 +14,7 @@
     var speakers = Model.GetSpeakers();
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
@@ -126,7 +126,7 @@
  }
  <div class="row">
   <div class="col-xs-12">
-   <div class="resourcesComponent" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
+   <div class="resourcesComponent" data-moduleid="@Dnn.ModuleContext.ModuleId"
         data-conferenceid="@Model.ConferenceId" data-sessionid="@Model.SessionId"
         data-resourcedir="@(Dnn.PortalSettings.HomeDirectory)@(Model.GetSessionResourcesPath("/"))"
         data-resources="@(Newtonsoft.Json.JsonConvert.SerializeObject(SessionResourceRepository.Instance.GetSessionResourcesBySession(Model.SessionId).Where(r => r.Visibility == 1 | isPresenter | ConferenceModuleContext.Security.CanManage)))"
diff --git a/Server/Conference/Views/Speaker/BulkAdd.cshtml b/Server/Conference/Views/Speaker/BulkAdd.cshtml
@@ -7,7 +7,7 @@
     ConferenceModuleContext.AddEditScripts();
 }
 
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>
diff --git a/Server/Conference/Views/Speaker/Edit.cshtml b/Server/Conference/Views/Speaker/Edit.cshtml
@@ -21,7 +21,7 @@
  }
 
 }
-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"
+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"
      data-resources="@SerializedResources()"
      data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">
 </div>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`ConferenceModuleContext.AddEditScripts();`
`8`	`8`	`}`
`9`	`9`
`10`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`10`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`11`	`11`	`data-resources="@SerializedResources()"`
`12`	`12`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`13`	`13`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`userFolder = DotNetNuke.Services.FileSystem.FolderManager.Instance.GetUserFolder(user).FolderPath;`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`23`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`24`	`24`	`data-resources="@SerializedResources()"`
`25`	`25`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`26`	`26`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`ConferenceModuleContext.AddEditScripts();`
`9`	`9`	`}`
`10`	`10`
`11`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`11`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`12`	`12`	`data-resources="@SerializedResources()"`
`13`	`13`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`14`	`14`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`var speakers = SpeakerRepository.Instance.GetSpeakersByConference(Model.ConferenceId).OrderBy(s => s.LastName);`
`9`	`9`	`}`
`10`	`10`
`11`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`11`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`12`	`12`	`data-resources="@SerializedResources()"`
`13`	`13`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`14`	`14`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`var allSessions = Connect.Conference.Core.Repositories.SessionRepository.Instance.GetSessionsByConference(Model.ConferenceId);`
`8`	`8`	`}`
`9`	`9`
`10`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`10`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`11`	`11`	`data-resources="@SerializedResources()"`
`12`	`12`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`13`	`13`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`var currentUserStatus = ConferenceModuleContext.Security.GoingToConferenceStatus(Model.ConferenceId);`
`12`	`12`	`}`
`13`	`13`
`14`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`14`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`15`	`15`	`data-resources="@SerializedResources()"`
`16`	`16`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`17`	`17`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`20`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`21`	`21`	`data-resources="@SerializedResources()"`
`22`	`22`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`23`	`23`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`var totalComments = commentList.TotalCount;`
`10`	`10`	`}`
`11`	`11`
`12`		`-<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId"`
	`12`	`+<div class="connectConference" data-moduleid="@Dnn.ModuleContext.ModuleId" data-tabid="@Dnn.ModuleContext.TabId"`
`13`	`13`	`data-resources="@SerializedResources()"`
`14`	`14`	`data-security="@(Newtonsoft.Json.JsonConvert.SerializeObject(ConferenceModuleContext.Security))">`
`15`	`15`	`</div>`