Skip to content

Commit 1d46d4e

Browse files
MaiklTMaiklT
committed
Fixed #22 
1 parent ea73b70 commit 1d46d4e

5 files changed

Lines changed: 30 additions & 46 deletions

File tree

‎Components/ParametersInfo.cs‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -36,59 +36,43 @@ namespace DotNetNuke.Modules.IFrame.Components
3636
[Cacheable("IFrame_Parameters", CacheItemPriority.Normal, 20)]
3737
public class ParametersInfo
3838
{
39-
private char[] _invalidCharacters = new char[]{'<', '>', ',', ' ', ';', '\"', '\'', '?', '&' };
39+
public int ParameterID { get; set; }
40+
public int ModuleID { get; set; }
41+
public string Name { get; set; }
42+
public ParameterType Type { get; set; }
43+
public string Argument { get; set; }
44+
public bool UseAsHash { get; set; }
4045

41-
private ModuleController _moduleController = null;
42-
protected ModuleController ModuleController
43-
{
44-
get
45-
{
46-
if (_moduleController == null)
47-
_moduleController = new ModuleController();
48-
return _moduleController;
49-
}
50-
}
46+
[IgnoreColumn]
47+
private char[] _invalidCharacters = new char[]{'<', '>', ',', ' ', ';', '\"', '\'', '?', '&' };
5148

49+
[IgnoreColumn]
5250
private ModuleInfo _moduleInfo = null;
53-
protected ModuleInfo ModuleInfo
54-
{
55-
get
56-
{
57-
if (_moduleController == null)
58-
_moduleInfo = ModuleController.GetModule(ModuleID);
59-
return _moduleInfo;
60-
}
61-
}
6251

63-
private PortalController _portalController = null;
64-
protected PortalController PortalController
52+
[IgnoreColumn]
53+
private ModuleInfo ModuleInfo
6554
{
6655
get
6756
{
68-
if (_portalController == null)
69-
_portalController = new PortalController();
70-
return _portalController;
57+
_moduleInfo = ModuleController.Instance.GetModule(ModuleID, -1, true);
58+
return _moduleInfo;
7159
}
7260
}
7361

62+
[IgnoreColumn]
7463
private PortalInfo _portalInfo = null;
64+
65+
[IgnoreColumn]
7566
private PortalInfo PortalInfo
7667
{
7768
get
7869
{
79-
if (_portalInfo == null)
80-
_portalInfo = PortalController.GetPortal(ModuleInfo.PortalID);
70+
_portalInfo = PortalController.Instance.GetPortal(ModuleInfo.PortalID);
8171
return _portalInfo;
8272
}
8373
}
8474

85-
public int ParameterID { get; set; }
86-
public int ModuleID { get; set; }
87-
public string Name { get; set; }
88-
public ParameterType Type { get; set; }
89-
public string Argument { get; set; }
90-
public bool UseAsHash { get; set; }
91-
75+
[IgnoreColumn]
9276
public override string ToString()
9377
{
9478
if (UseAsHash)
@@ -109,6 +93,7 @@ public bool IsValid
10993
}
11094
}
11195

96+
[IgnoreColumn]
11297
public bool IsArgumentRequired()
11398
{
11499
bool argumentIsRequired;
@@ -127,6 +112,7 @@ public bool IsArgumentRequired()
127112
return argumentIsRequired;
128113
}
129114

115+
[IgnoreColumn]
130116
public string GetValue()
131117
{
132118
string result = string.Empty;

‎DNN_IFrame.dnn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN_IFrame" type="Module" version="08.01.02">
3+
<package name="DNN_IFrame" type="Module" version="08.01.03">
44
<friendlyName>IFrame</friendlyName>
55
<description>
66
<![CDATA[
@@ -182,7 +182,7 @@
182182
<script type="UnInstall">
183183
<path>Providers\DataProviders\SqlDataProvider</path>
184184
<name>Uninstall.SqlDataProvider</name>
185-
<version>08.01.02</version>
185+
<version>08.01.03</version>
186186
</script>
187187
</scripts>
188188
</component>
@@ -232,7 +232,7 @@
232232
<attributes>
233233
<businessControllerClass>DotNetNuke.Modules.IFrame.Components.ParametersController</businessControllerClass>
234234
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
235-
<upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02,08.01.00,08.01.01,08.01.02</upgradeVersionsList>
235+
<upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02,08.01.00,08.01.01,08.01.02,08.01.03</upgradeVersionsList>
236236
</attributes>
237237
</eventMessage>
238238
</component>
@@ -242,7 +242,7 @@
242242
<assembly>
243243
<path>bin</path>
244244
<name>DotNetNuke.Modules.IFrame.dll</name>
245-
<version>8.1.2.0</version>
245+
<version>8.1.3.0</version>
246246
</assembly>
247247
</assemblies>
248248
</component>

‎Documentation/ReleaseNotes.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ <h3>DNN IFrame Project 08.01.02</h3>
4343
<li>Requires .Net Framework 4.7.2</li>
4444
<li>Fixed #21 (Errors running in DNN 09.04.01)</li>
4545
</ul>
46+
<h3>DNN IFrame Project 08.01.03</h3>
47+
<ul>
48+
<li>Fixed #22 (Pre existing parameters not appearing, but still exist in database)</li>
49+
</ul>
4650
</div>

‎IFrame.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,9 @@
112112
<HintPath>..\..\..\bin\DotNetNuke.WebUtility.dll</HintPath>
113113
</Reference>
114114
<Reference Include="System" />
115-
<Reference Include="System.Data" />
116-
<Reference Include="System.Data.DataSetExtensions" />
117115
<Reference Include="System.Web" />
118-
<Reference Include="System.Web.ApplicationServices" />
119-
<Reference Include="System.Web.DynamicData" />
120-
<Reference Include="System.Web.Entity" />
121116
<Reference Include="System.Web.Extensions" />
122117
<Reference Include="System.Xml" />
123-
<Reference Include="System.Xml.Linq" />
124118
</ItemGroup>
125119
<PropertyGroup>
126120
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("8.1.2.0")]
35-
[assembly: AssemblyFileVersion("8.1.2.0")]
34+
[assembly: AssemblyVersion("8.1.3.0")]
35+
[assembly: AssemblyFileVersion("8.1.3.0")]

0 commit comments

Comments
 (0)