From ebf78dd08d33ffe6bf1e8ed7ec8708006d84c4cc Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Wed, 11 Jun 2014 21:56:50 +1000
Subject: [PATCH] Bug Fix: Sharepoint Public Reports XSLT

Incorrect serialization of HeldDeviceItem and referencing in the XSLT.
---
 .../Jobs/Noticeboards/HeldDeviceItem.cs        |  9 ++++++++-
 .../Public/UserHeldDevicesXml_Sharepoint.xslt  |  6 +++---
 Disco.Web/Disco.Web.csproj                     | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Disco.Services/Jobs/Noticeboards/HeldDeviceItem.cs b/Disco.Services/Jobs/Noticeboards/HeldDeviceItem.cs
index 6c9b85c3..c463cf7b 100644
--- a/Disco.Services/Jobs/Noticeboards/HeldDeviceItem.cs
+++ b/Disco.Services/Jobs/Noticeboards/HeldDeviceItem.cs
@@ -1,7 +1,6 @@
 using Disco.Data.Configuration.Modules;
 using Disco.Models.Repository;
 using Disco.Models.Services.Jobs.Noticeboards;
-using Disco.Services.Interop.ActiveDirectory;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,6 +19,7 @@ namespace Disco.Services.Jobs.Noticeboards
             {
                 return DeviceComputerName == null ? null : UserExtensions.FriendlyUserId(DeviceComputerName);
             }
+            set { } // for XML Serialization
         }
         public string DeviceComputerName { get; set; }
 
@@ -40,6 +40,7 @@ namespace Disco.Services.Jobs.Noticeboards
 
                 return sb.ToString();
             }
+            set { } // for XML Serialization
         }
 
         public int DeviceProfileId { get; set; }
@@ -58,6 +59,7 @@ namespace Disco.Services.Jobs.Noticeboards
 
                 return null;
             }
+            set { } // for XML Serialization
         }
 
         public string UserId { get; set; }
@@ -67,6 +69,7 @@ namespace Disco.Services.Jobs.Noticeboards
             {
                 return UserId == null ? null : UserExtensions.FriendlyUserId(UserId);
             }
+            set { } // for XML Serialization
         }
         public string UserDisplayName { get; set; }
 
@@ -78,6 +81,7 @@ namespace Disco.Services.Jobs.Noticeboards
             {
                 return WaitingForUserActionSince.ToUnixEpoc();
             }
+            set { } // for XML Serialization
         }
 
         public bool ReadyForReturn { get; set; }
@@ -88,6 +92,7 @@ namespace Disco.Services.Jobs.Noticeboards
             {
                 return EstimatedReturnTime.ToUnixEpoc();
             }
+            set { } // for XML Serialization
         }
 
         public DateTime? ReadyForReturnSince { get; set; }
@@ -97,6 +102,7 @@ namespace Disco.Services.Jobs.Noticeboards
             {
                 return ReadyForReturnSince.ToUnixEpoc();
             }
+            set { } // for XML Serialization
         }
 
         public bool IsAlert
@@ -111,6 +117,7 @@ namespace Disco.Services.Jobs.Noticeboards
 
                 return false;
             }
+            set { } // for XML Serialization
         }
 
         internal static IEnumerable<HeldDeviceItem> FromJobs(IQueryable<Job> jobs)
diff --git a/Disco.Web/ClientSource/Style/Public/UserHeldDevicesXml_Sharepoint.xslt b/Disco.Web/ClientSource/Style/Public/UserHeldDevicesXml_Sharepoint.xslt
index ae82bbaa..899c784d 100644
--- a/Disco.Web/ClientSource/Style/Public/UserHeldDevicesXml_Sharepoint.xslt
+++ b/Disco.Web/ClientSource/Style/Public/UserHeldDevicesXml_Sharepoint.xslt
@@ -1,20 +1,20 @@
 <?xml version='1.0' ?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output encoding="us-ascii" method="html" indent="yes"  />
-  <xsl:template match="/ArrayOfIHeldDeviceItem">
+  <xsl:template match="/ArrayOfHeldDeviceItem">
     <table class="ms-listviewtable" width="100%" border="0" cellSpacing="0" cellPadding="0">
       <tbody>
         <tr class="ms-viewheadertr ms-vhltr">
           <th class="ms-vh2">Username</th>
           <th class="ms-vh2">Name</th>
         </tr>
-        <xsl:apply-templates select="IHeldDeviceItem">
+        <xsl:apply-templates select="HeldDeviceItem">
           <xsl:sort select="UserIdFriendly" />
         </xsl:apply-templates>
       </tbody>
     </table>
   </xsl:template>
-  <xsl:template match="IHeldDeviceItem">
+  <xsl:template match="HeldDeviceItem">
     <tr class="ms-itmhover" style="cursor: default">
       <td class="ms-vb-title ms-vb-firstCell">
         <xsl:value-of select="UserIdFriendly"/>
diff --git a/Disco.Web/Disco.Web.csproj b/Disco.Web/Disco.Web.csproj
index 0a7d3923..9beae525 100644
--- a/Disco.Web/Disco.Web.csproj
+++ b/Disco.Web/Disco.Web.csproj
@@ -1021,18 +1021,18 @@
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>TaskStatus.generated.cs</LastGenOutput>
     </None>
-    <Content Include="Areas\Config\Views\UserFlag\Create.cshtml">
+    <None Include="Areas\Config\Views\UserFlag\Create.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Create.generated.cs</LastGenOutput>
-    </Content>
-    <Content Include="Areas\Config\Views\UserFlag\Index.cshtml">
+    </None>
+    <None Include="Areas\Config\Views\UserFlag\Index.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Index.generated.cs</LastGenOutput>
-    </Content>
-    <Content Include="Areas\Config\Views\UserFlag\Show.cshtml">
+    </None>
+    <None Include="Areas\Config\Views\UserFlag\Show.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Show.generated.cs</LastGenOutput>
-    </Content>
+    </None>
     <None Include="Areas\Public\Views\HeldDevices\Index.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Index.generated.cs</LastGenOutput>
@@ -2003,10 +2003,10 @@
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>Show.generated.cs</LastGenOutput>
     </None>
-    <Content Include="Views\User\UserParts\_Flags.cshtml">
+    <None Include="Views\User\UserParts\_Flags.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_Flags.generated.cs</LastGenOutput>
-    </Content>
+    </None>
     <None Include="Views\User\UserParts\_Authorization.cshtml">
       <Generator>RazorGenerator</Generator>
       <LastGenOutput>_Authorization.generated.cs</LastGenOutput>
@@ -2157,7 +2157,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
+      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />