Skip to content
This repository has been archived by the owner on Aug 17, 2021. It is now read-only.

Commit

Permalink
Quicksilver release version 13.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Viet Anh Nguyen committed Jul 23, 2019
1 parent 6064f70 commit 4162229
Show file tree
Hide file tree
Showing 20 changed files with 289 additions and 262 deletions.
6 changes: 3 additions & 3 deletions Sources/AssemblyVersionAuto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@


[assembly: AssemblyCopyright("Copyright ? 2019 Episerver")]
[assembly: AssemblyVersion("13.4.0.0")]
[assembly: AssemblyInformationalVersion("13.4.0")]
[assembly: AssemblyFileVersion("13.4.0.3701")]
[assembly: AssemblyVersion("13.5.0.0")]
[assembly: AssemblyInformationalVersion("13.5.0")]
[assembly: AssemblyFileVersion("13.5.0.3705")]
112 changes: 57 additions & 55 deletions Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/Reference1N.xml
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,60 @@
<?xml version="1.0" encoding="utf-8" ?>
<View xmlns="http://schemas.mediachase.com/ecf/view">
<BafGrid>
<Toolbar>
<add>
<!--<Button id="NewItemButton" text="{IbnFramework.Common:NewEntity}" imageUrl="~/Layouts/Images/newitem.gif" commandName="MC_MUI_NewItem" itemSplitter="Right"></Button>-->
<Button id="AddButton" text="{Common:tAddEntities}" imageUrl="~/Apps/MetaUIEntity/Images/addselected.gif" commandName="MC_MUI_AddSelected" itemSplitter="Right"></Button>
<Button id="DeleteSelectedButton" text="{Common:DeleteSelected}" imageUrl="~/Apps/MetaDataBase/Images/delete.gif" commandName="MC_MUI_DeleteSelected" itemSplitter="Right"></Button>
</add>
</Toolbar>
<CustomColumns id="CM_MUI_Columns">
<add>
<Column id="472F004E-AF2F-4d64-91A0-17B37248A71C" type="ColumnsActions" templateUrl="~/Apps/MetaUIEntity/Primitives/ColumnsActions.GridEntity.ascx">
<Item imageUrl="~/Apps/MetaUIEntity/Images/list_view.gif" commandName="MC_MUI_ViewItem" paddingRight="5" tooltip="{Common:ItemView}" />
<Item imageUrl="~/Apps/MetaDataBase/Images/edit.gif" commandName="MC_MUI_EditItem" paddingRight="5" tooltip="{Common:Edit}" />
</Column>
</add>
</CustomColumns>
<Commands>
<add>
<Command id="MC_MUI_AddSelected">
<CommandType>OpenFrameModalPopup</CommandType>
<PopupTitle>{Common:SearchObjects}</PopupTitle>
<Url>~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&amp;refreshName=SelectItems_Refresh&amp;ReturnCommand=MC_MUI_AddSelected&amp;MultipleSelect=1&amp;CanCreate=1&amp;ContainerFieldName={HttpContext:FieldName}&amp;ContainerId={HttpContext:FieldValue}</Url>
<Width>640</Width>
<Height>480</Height>
<Left>100</Left>
<Top>50</Top>
<Drag>True</Drag>
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
</Command>
<Command id="MC_MUI_NewItem">
<CommandType>Navigate</CommandType>
<Url>~/Apps/MetaUIEntity/Pages/EntityEdit.aspx?ClassName={HttpContext:ClassName}&amp;ContainerFieldName={HttpContext:FieldName}&amp;ContainerId={HttpContext:FieldValue}</Url>
</Command>
<Command id="MC_MUI_DeleteSelected">
<CommandType>ServerAction</CommandType>
<ConfirmationText>{Common:DeleteSelectedItemsConfirmation}</ConfirmationText>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.ExcludeSelectedEntityHandler, Mediachase.ConsoleManager" />
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
</Command>
<Command id="MC_MUI_ViewItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_EditItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_Ref1_NeedToDataBind">
<CommandType>ServerAction</CommandType>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.NeedToDataBindHandler, Mediachase.ConsoleManager" />
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
</Command>
</add>
</Commands>
</BafGrid>
<BafGrid>
<Toolbar>
<add>
<!--<Button id="NewItemButton" text="{IbnFramework.Common:NewEntity}" imageUrl="~/Layouts/Images/newitem.gif" commandName="MC_MUI_NewItem" itemSplitter="Right"></Button>-->
<Button id="AddButton" text="{Common:tAddEntities}" imageUrl="~/Apps/MetaUIEntity/Images/addselected.gif" commandName="MC_MUI_AddSelected" itemSplitter="Right" permissions="businessfoundation:{ClassName}:create:permission"></Button>
<Button id="DeleteSelectedButton" text="{Common:DeleteSelected}" imageUrl="~/Apps/MetaDataBase/Images/delete.gif" commandName="MC_MUI_DeleteSelected" itemSplitter="Right" permissions="businessfoundation:{ClassName}:delete:permission"></Button>
</add>
</Toolbar>
<CustomColumns id="CM_MUI_Columns">
<add>
<Column id="472F004E-AF2F-4d64-91A0-17B37248A71C" type="ColumnsActions" templateUrl="~/Apps/MetaUIEntity/Primitives/ColumnsActions.GridEntity.ascx">
<Item imageUrl="~/Apps/MetaUIEntity/Images/list_view.gif" commandName="MC_MUI_ViewItem" paddingRight="5" tooltip="{Common:ItemView}" />
<Item imageUrl="~/Apps/MetaDataBase/Images/edit.gif" commandName="MC_MUI_EditItem" paddingRight="5" tooltip="{Common:Edit}" />
</Column>
</add>
</CustomColumns>
<Commands>
<add>
<Command id="MC_MUI_AddSelected">
<CommandType>OpenFrameModalPopup</CommandType>
<PopupTitle>{Common:SearchObjects}</PopupTitle>
<Url>~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&amp;refreshName=SelectItems_Refresh&amp;ReturnCommand=MC_MUI_AddSelected&amp;MultipleSelect=1&amp;CanCreate=1&amp;ContainerFieldName={HttpContext:FieldName}&amp;ContainerId={HttpContext:FieldValue}</Url>
<Width>640</Width>
<Height>480</Height>
<Left>100</Left>
<Top>50</Top>
<Drag>True</Drag>
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
<EnableHandler type="Mediachase.Commerce.Manager.CommandHandlers.BusinessObjectPermissionEnableHandler, Mediachase.ConsoleManager" />
</Command>
<Command id="MC_MUI_NewItem">
<CommandType>Navigate</CommandType>
<Url>~/Apps/MetaUIEntity/Pages/EntityEdit.aspx?ClassName={HttpContext:ClassName}&amp;ContainerFieldName={HttpContext:FieldName}&amp;ContainerId={HttpContext:FieldValue}</Url>
</Command>
<Command id="MC_MUI_DeleteSelected">
<CommandType>ServerAction</CommandType>
<ConfirmationText>{Common:DeleteSelectedItemsConfirmation}</ConfirmationText>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.ExcludeSelectedEntityHandler, Mediachase.ConsoleManager" />
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
<EnableHandler type="Mediachase.Commerce.Manager.CommandHandlers.BusinessObjectPermissionEnableHandler, Mediachase.ConsoleManager" />
</Command>
<Command id="MC_MUI_ViewItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_EditItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_Ref1_NeedToDataBind">
<CommandType>ServerAction</CommandType>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.NeedToDataBindHandler, Mediachase.ConsoleManager" />
<UpdatePanelIds>ContentPanelPanel</UpdatePanelIds>
</Command>
</add>
</Commands>
</BafGrid>
</View>
96 changes: 49 additions & 47 deletions Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/ReferenceNN.xml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@
<?xml version="1.0" encoding="utf-8" ?>
<View xmlns="http://schemas.mediachase.com/ecf/view">
<BafGrid>
<Toolbar>
<add>
<Button id="AddButton" text="{Common:tAddEntities}" imageUrl="~/Apps/MetaUIEntity/Images/addselected.gif" commandName="MC_MUI_AddSelected" itemSplitter="Right"></Button>
<Button id="DeleteSelectedButton" text="{Common:DeleteSelected}" imageUrl="~/Apps/MetaDataBase/Images/delete.gif" commandName="MC_MUI_DeleteSelected" itemSplitter="Right"></Button>
</add>
</Toolbar>
<CustomColumns id="CM_MUI_Columns">
<add>
<Column id="472F004E-AF2F-4d64-91A0-17B37248A71C" type="ColumnsActions" templateUrl="~/Apps/MetaUIEntity/Primitives/ColumnsActions.GridEntity.ascx">
<Item imageUrl="~/Apps/MetaUIEntity/Images/list_view.gif" commandName="MC_MUI_ViewItem" paddingRight="5" tooltip="{Common:ItemView}" />
<Item imageUrl="~/Apps/MetaDataBase/Images/edit.gif" commandName="MC_MUI_EditItem" paddingRight="5" tooltip="{Common:Edit}" />
</Column>
</add>
</CustomColumns>
<Commands>
<add>
<Command id="MC_MUI_AddSelected">
<CommandType>OpenFrameModalPopup</CommandType>
<PopupTitle>{Common:SearchObjects}</PopupTitle>
<Url>~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&amp;refreshName=SelectItems_Refresh&amp;ReturnCommand=MC_MUI_AddSelected&amp;MultipleSelect=1&amp;CanCreate=1</Url>
<Width>640</Width>
<Height>480</Height>
<Left>100</Left>
<Top>50</Top>
<Drag>True</Drag>
</Command>
<Command id="MC_MUI_DeleteSelected">
<CommandType>ServerAction</CommandType>
<ConfirmationText>{Common:DeleteSelectedItemsConfirmation}</ConfirmationText>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.DeleteSelectedBridgeEntityHandler, Mediachase.ConsoleManager" />
</Command>
<Command id="MC_MUI_ViewItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_EditItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_RefN_NeedToDataBind">
<CommandType>ServerAction</CommandType>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.NeedToDataBindHandler, Mediachase.ConsoleManager" />
</Command>
</add>
</Commands>
</BafGrid>
<BafGrid>
<Toolbar>
<add>
<Button id="AddButton" text="{Common:tAddEntities}" imageUrl="~/Apps/MetaUIEntity/Images/addselected.gif" commandName="MC_MUI_AddSelected" itemSplitter="Right" permissions="businessfoundation:{ClassName}:create:permission"></Button>
<Button id="DeleteSelectedButton" text="{Common:DeleteSelected}" imageUrl="~/Apps/MetaDataBase/Images/delete.gif" commandName="MC_MUI_DeleteSelected" itemSplitter="Right" permissions="businessfoundation:{ClassName}:delete:permission"></Button>
</add>
</Toolbar>
<CustomColumns id="CM_MUI_Columns">
<add>
<Column id="472F004E-AF2F-4d64-91A0-17B37248A71C" type="ColumnsActions" templateUrl="~/Apps/MetaUIEntity/Primitives/ColumnsActions.GridEntity.ascx">
<Item imageUrl="~/Apps/MetaUIEntity/Images/list_view.gif" commandName="MC_MUI_ViewItem" paddingRight="5" tooltip="{Common:ItemView}" />
<Item imageUrl="~/Apps/MetaDataBase/Images/edit.gif" commandName="MC_MUI_EditItem" paddingRight="5" tooltip="{Common:Edit}" />
</Column>
</add>
</CustomColumns>
<Commands>
<add>
<Command id="MC_MUI_AddSelected">
<CommandType>OpenFrameModalPopup</CommandType>
<PopupTitle>{Common:SearchObjects}</PopupTitle>
<Url>~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&amp;refreshName=SelectItems_Refresh&amp;ReturnCommand=MC_MUI_AddSelected&amp;MultipleSelect=1&amp;CanCreate=1</Url>
<Width>640</Width>
<Height>480</Height>
<Left>100</Left>
<Top>50</Top>
<Drag>True</Drag>
<EnableHandler type="Mediachase.Commerce.Manager.CommandHandlers.BusinessObjectPermissionEnableHandler, Mediachase.ConsoleManager" />
</Command>
<Command id="MC_MUI_DeleteSelected">
<CommandType>ServerAction</CommandType>
<ConfirmationText>{Common:DeleteSelectedItemsConfirmation}</ConfirmationText>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.DeleteSelectedBridgeEntityHandler, Mediachase.ConsoleManager" />
<EnableHandler type="Mediachase.Commerce.Manager.CommandHandlers.BusinessObjectPermissionEnableHandler, Mediachase.ConsoleManager" />
</Command>
<Command id="MC_MUI_ViewItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_EditItem">
<CommandType>ClientAction</CommandType>
<ClientScript>CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]')</ClientScript>
</Command>
<Command id="MC_MUI_RefN_NeedToDataBind">
<CommandType>ServerAction</CommandType>
<Handler type="Mediachase.Ibn.Web.UI.MetaUIEntity.CommandHandlers.NeedToDataBindHandler, Mediachase.ConsoleManager" />
</Command>
</add>
</Commands>
</BafGrid>
</View>
4 changes: 2 additions & 2 deletions ...EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReference1N.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</td>
</tr>
<tr>
<td >
<mc:EntityGrid ID="grdMain" runat="server" ShowPaging="false" LayoutResizeEnable="false" />
<td style="max-height: 600px">
<mc:EntityGrid ID="grdMain" runat="server" ShowPaging="true" LayoutResizeEnable="false"/>
<mc:MCGridAction runat="server" ID="ctrlGridEventUpdater" />
<asp:LinkButton ID="lbAddItems" runat="server" Visible="false" Text="postLink" OnClick="lbAddItems_Click"></asp:LinkButton>
</td>
Expand Down
4 changes: 2 additions & 2 deletions ...EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReferenceNN.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</td>
</tr>
<tr>
<td >
<mc:EntityGrid ID="grdMain" runat="server" ShowPaging="false" LayoutResizeEnable="false" />
<td style="max-height: 600px">
<mc:EntityGrid ID="grdMain" runat="server" ShowPaging="true" LayoutResizeEnable="false" />
<mc:MCGridAction runat="server" ID="ctrlGridEventUpdater" />
<asp:LinkButton ID="lbAddItems" runat="server" Visible="false" OnClick="lbAddItems_Click"></asp:LinkButton>
</td>
Expand Down
29 changes: 26 additions & 3 deletions ...ference.Commerce.Manager/Apps/Shell/Scripts/BusinessFoundation/GridViewHeaderBehavior2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,18 +364,41 @@ Mediachase.GridViewHeaderBehavior2.prototype = {
if (this.divResizeProxy.parentNode.offsetWidth - 1 >= 0)
this.divResizeProxy.style.width = this.divResizeProxy.parentNode.offsetWidth - 2 + 'px';

var parentMaxHeight = this.divResizeProxy.parentNode.style.maxHeight;
var maxHeight = 0;
if (parentMaxHeight) {
maxHeight = parseInt(parentMaxHeight, 10);
}
var newHeight = 600;

if (this._layoutHandler == null && !this.dashboardMode) {
this.divResizeProxy.style.height = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4 + 'px';
}
else {
if (!this.layoutResizeEnable)
{
if (this.divWrapper)
this.divResizeProxy.style.height = this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px';;//this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px'; //16 - eto zapas dla horizontal scrolla
if (this.divWrapper) {
newHeight = this.get_element().offsetHeight +
this.bottomDiv.offsetHeight +
this.headDiv.offsetHeight -
this.get_element().offsetTop +
17;
if (maxHeight > 0 && newHeight > maxHeight) {
newHeight = maxHeight;
}

this.divResizeProxy.style.height =
newHeight +
'px'; //this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px'; //16 - eto zapas dla horizontal scrolla
}
}
else
{
this.divResizeProxy.style.height = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4 + 'px';
newHeight = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4;
if (maxHeight > 0 && newHeight > maxHeight) {
newHeight = maxHeight;
}
this.divResizeProxy.style.height =newHeight + 'px';
}

}
Expand Down
Loading

0 comments on commit 4162229

Please sign in to comment.