zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update_DB RDS tables fix

Browse source
This commit is contained in:
vfedosevich 2014-12-31 03:14:03 -08:00
parent 8cc464668a
commit c0fecdcf33
5 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WebsitePanel/Database/update_db.sql
View file

@ -5428,9 +5428,7 @@ GO
/*Remote Desktop Services*/ /*Remote Desktop Services*/
/*Remote Desktop Services Tables*/ /*Remote Desktop Services Tables*/
IF EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSCollectionUsers') IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSCollectionUsers')
DROP TABLE RDSCollectionUsers
GO
CREATE TABLE RDSCollectionUsers CREATE TABLE RDSCollectionUsers
( (
ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY, ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY,
@ -5440,9 +5438,7 @@ CREATE TABLE RDSCollectionUsers
GO GO
IF EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSServers') IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSServers')
DROP TABLE RDSServers
GO
CREATE TABLE RDSServers CREATE TABLE RDSServers
( (
ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY, ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY,
@ -5456,9 +5452,7 @@ CREATE TABLE RDSServers
GO GO
IF EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSCollections') IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'RDSCollections')
DROP TABLE RDSCollections
GO
CREATE TABLE RDSCollections CREATE TABLE RDSCollections
( (
ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY, ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY,

1
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
View file

@ -284,6 +284,7 @@ namespace WebsitePanel.EnterpriseServer
catch (Exception ex) catch (Exception ex)
{ {
result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_COLLECTION", ex); result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_COLLECTION", ex);
throw TaskManager.WriteError(ex);
} }
finally finally
{ {

4
WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
View file

@ -294,10 +294,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer); AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
} }
} }
catch (Exception e)
{
result = false;
}
finally finally
{ {
CloseRunspace(runSpace); CloseRunspace(runSpace);

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx
View file

@ -28,7 +28,7 @@
</table> </table>
<div class="FormFooterClean"> <div class="FormFooterClean">
<asp:Button id="btnAdd" runat="server" Text="Add" CssClass="Button1" meta:resourcekey="btnAdd" ValidationGroup="AddRDSServer" OnClick="btnAdd_Click"></asp:Button> <asp:Button id="btnAdd" runat="server" Text="Add" CssClass="Button1" meta:resourcekey="btnAdd" ValidationGroup="AddRDSServer" OnClick="btnAdd_Click" OnClientClick="ShowProgressDialog('Adding server...');"></asp:Button>
<asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="AddRDSServer" /> <asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="AddRDSServer" />
</div> </div>
</div> </div>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
View file

@ -37,7 +37,7 @@
</fieldset> </fieldset>
<div class="FormFooter"> <div class="FormFooter">
<asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" OnClick="btnSave_Click" ValidationGroup="SaveRDSCollection"></asp:Button> <asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" OnClick="btnSave_Click" OnClientClick="ShowProgressDialog('Adding collection...');" ValidationGroup="SaveRDSCollection"></asp:Button>
</div> </div>
</div> </div>
</div> </div>