Skip to content

Commit

Permalink
Merge pull request #292 from Orckestra/dev
Browse files Browse the repository at this point in the history
Orckestra CMS 5.4
  • Loading branch information
Marcus Wendt authored Nov 2, 2016
2 parents 3ad7f67 + eea9045 commit 40060b5
Show file tree
Hide file tree
Showing 40 changed files with 1,080 additions and 171 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private void enterDataCodeActivity_ExecuteCode(object sender, EventArgs e)

Guid pageId = GetBinding<Guid>(BindingNames.PageId);

var helper = new DataTypeDescriptorFormsHelper(dataTypeDescriptor, true, null)
var helper = new DataTypeDescriptorFormsHelper(dataTypeDescriptor, true, EntityToken)
{
LayoutIconHandle = "associated-data-add"
};
Expand Down
13 changes: 13 additions & 0 deletions Composite.Workflows/Composite.Workflows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
Expand Down Expand Up @@ -688,6 +689,12 @@
<Compile Include="Plugins\Elements\ElementProviders\VisualFunctionProviderElementProvider\EditVisualFunctionWorkflow.designer.cs">
<DependentUpon>EditVisualFunctionWorkflow.cs</DependentUpon>
</Compile>
<Compile Include="Plugins\Elements\ElementProviders\WebsiteFileElementProvider\UploadAndExtractZipFileWorkflow.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Plugins\Elements\ElementProviders\WebsiteFileElementProvider\UploadAndExtractZipFileWorkflow.Designer.cs">
<DependentUpon>UploadAndExtractZipFileWorkflow.cs</DependentUpon>
</Compile>
<Compile Include="Plugins\Elements\ElementProviders\WebsiteFileElementProvider\AddNewWebsiteFileWorkflow.cs">
<SubType>Component</SubType>
</Compile>
Expand Down Expand Up @@ -774,6 +781,9 @@
<DependentUpon>EditXsltFunctionWorkflow.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Composite\Properties\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Plugins\Elements\ElementProviders\GeneratedDataTypesElementProvider\AddNewCompositionTypeWorkflow.cs">
<SubType>Component</SubType>
</Compile>
Expand Down Expand Up @@ -1208,6 +1218,9 @@
<EmbeddedResource Include="Plugins\Elements\ElementProviders\VisualFunctionProviderElementProvider\EditVisualFunctionWorkflow.layout">
<DependentUpon>EditVisualFunctionWorkflow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Plugins\Elements\ElementProviders\WebsiteFileElementProvider\UploadAndExtractZipFileWorkflow.layout">
<DependentUpon>UploadAndExtractZipFileWorkflow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Plugins\Elements\ElementProviders\WebsiteFileElementProvider\AddNewWebsiteFileWorkflow.layout">
<DependentUpon>AddNewWebsiteFileWorkflow.cs</DependentUpon>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,27 @@ private void finalizeCodeActivity_ExecuteCode(object sender, EventArgs e)
SpecificTreeRefresher specificTreeRefresher = this.CreateSpecificTreeRefresher();
specificTreeRefresher.PostRefreshMesseges(this.EntityToken);

if (this.EntityToken is WebsiteFileElementProviderEntityToken)
string providerName;
string rootPath;

switch (this.EntityToken.GetType().Name)
{
WebsiteFileElementProviderEntityToken folderToken = (WebsiteFileElementProviderEntityToken)this.EntityToken;
var newFileToken = new WebsiteFileElementProviderEntityToken(folderToken.ProviderName, newFolderPath, folderToken.RootPath);
SelectElement(newFileToken);
case nameof(WebsiteFileElementProviderRootEntityToken):
WebsiteFileElementProviderRootEntityToken rootToken = (WebsiteFileElementProviderRootEntityToken)this.EntityToken;
providerName = rootToken.ProviderName;
rootPath = rootToken.RootPath;
break;
case nameof(WebsiteFileElementProviderEntityToken):
WebsiteFileElementProviderEntityToken folderToken = (WebsiteFileElementProviderEntityToken)this.EntityToken;
providerName = folderToken.ProviderName;
rootPath = folderToken.RootPath;
break;
default:
throw new InvalidOperationException("Unexpected EntityToken type");
}

var newFileToken = new WebsiteFileElementProviderEntityToken(providerName, newFolderPath, rootPath);
SelectElement(newFileToken);
}


Expand Down
Loading

0 comments on commit 40060b5

Please sign in to comment.