Skip to content

Commit f3df8c5

Browse files
committed
Fix to UI to show DNN dialogs which appeared to work in dev but didn't in production
1 parent 0becb92 commit f3df8c5

File tree

7 files changed

+30
-26
lines changed

7 files changed

+30
-26
lines changed

Components/ModuleBase.vb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Public Class ModuleBase
6161
If ModulePermissionController.HasModulePermission(Me.ModuleConfiguration.ModulePermissions, "EDIT") Then
6262
IsAdmin = True
6363
End If
64+
DotNetNuke.Framework.jQuery.RequestDnnPluginsRegistration()
6465
End Sub
6566
#End Region
6667

DNNEurope.LocalizationEditor.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<Name>System.Data</Name>
118118
<Private>False</Private>
119119
</Reference>
120-
<Reference Include="System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
120+
<Reference Include="System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121121
<SpecificVersion>False</SpecificVersion>
122122
<HintPath>_References\System.Net.Http.dll</HintPath>
123123
<Private>False</Private>

LocalizationEditor.ascx.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Partial Public Class LocalizationEditor
111111
cmdClearCaches.Visible = IsAdmin And Me.Settings.CachePacks
112112
cmdUploadPack.Visible = IsAdmin Or IsEditor
113113
cmdCube.Visible = Settings.AllowDataExtract
114-
cmdService.Visible = IsEditor
114+
cmdService.Visible = CBool(UserPermissions.Count > 0)
115115

116116
If Not Me.IsPostBack Then
117117

My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Imports System.Runtime.InteropServices
2727
' You can specify all the values or you can default the Build and Revision Numbers
2828
' by using the '*' as shown below:
2929

30-
<Assembly: AssemblyVersion("04.05.00")>
31-
<Assembly: AssemblyFileVersionAttribute("04.05.00")>
32-
<Assembly: AssemblyInformationalVersion("04.05.00")>
30+
<Assembly: AssemblyVersion("04.05.01")>
31+
<Assembly: AssemblyFileVersionAttribute("04.05.01")>
32+
<Assembly: AssemblyInformationalVersion("04.05.01")>
3333

3434
'History
3535
'03.00.00 2009-08-10 Janga: User Interface.

_BuildSupport/Projects.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DNNEurope.LocalizationEditor.vbproj;04.05.00
1+
DNNEurope.LocalizationEditor.vbproj;04.05.01

_BuildSupport/Report.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set.buildvars:
3030

3131
set.versions:
3232

33-
[echo] Set Version 04.05.00 on DNNEurope.LocalizationEditor.vbproj
33+
[echo] Set Version 04.05.01 on DNNEurope.LocalizationEditor.vbproj
3434
Checking ..\My Project\AssemblyInfo.vb
3535
Checking ..\_Installation\DNNEurope.LocalizationEditor.dnn
3636
Reset References to _References\
@@ -57,8 +57,8 @@ Adjusting 'Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral'
5757
Adjusting Path 'Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral'
5858
Adjusting 'SharpZipLib, Version=0.81.0.1407, Culture=neutral'
5959
Adjusting Path 'SharpZipLib, Version=0.81.0.1407, Culture=neutral'
60-
Adjusting 'System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL'
61-
Adjusting Path 'System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL'
60+
Adjusting 'System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL'
61+
Adjusting Path 'System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL'
6262
Adjusting 'System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
6363
Adjusting Path 'System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
6464
Adjusting 'System.Web.WebPages, Version=2.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
@@ -71,7 +71,7 @@ clean.bindirectory:
7171
compile.projects:
7272

7373
[echo] Building DNNEurope.LocalizationEditor.vbproj
74-
[msbuild] Build started 01/02/2014 23:06:00.
74+
[msbuild] Build started 02/02/2014 09:40:34.
7575
[msbuild] Overriding target "GetFrameworkPaths" in project "C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets" with target "GetFrameworkPaths" from project "C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.NETFramework.targets".
7676
[msbuild] Overriding target "SatelliteDllsProjectOutputGroup" in project "C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets" with target "SatelliteDllsProjectOutputGroup" from project "C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.WinFX.targets".
7777
[msbuild] Project "E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\DNNEurope.LocalizationEditor.vbproj" on node 1 (Rebuild target(s)).
@@ -271,7 +271,7 @@ compile.projects:
271271
[msbuild] Private = 'False'
272272
[msbuild] System.Data
273273
[msbuild] Private = 'False'
274-
[msbuild] System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL
274+
[msbuild] System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL
275275
[msbuild] Private = 'False'
276276
[msbuild] HintPath = '_References\System.Net.Http.dll'
277277
[msbuild] SpecificVersion = 'False'
@@ -464,14 +464,14 @@ compile.projects:
464464
[msbuild] Considered "E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_References\mscorlib.exe", but it didn't exist.
465465
[msbuild] For SearchPath "{TargetFrameworkDirectory}".
466466
[msbuild] Considered "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.winmd", but it didn't exist.
467+
[msbuild] Required by "System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL".
467468
[msbuild] Required by "System.Web.WebPages, Version=2.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL".
468469
[msbuild] Required by "System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL".
469470
[msbuild] Required by "DotNetNuke, Version=7.0.0.1586, Culture=neutral, processorArchitecture=MSIL".
470471
[msbuild] Required by "Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral".
471472
[msbuild] Required by "GoogleTranslateAPI, Version=0.2.0.0, Culture=neutral, PublicKeyToken=37a8e65b17fcdcbb, processorArchitecture=MSIL".
472473
[msbuild] Required by "DotNetNuke.Web, Version=7.0.0.1586, Culture=neutral, processorArchitecture=MSIL".
473474
[msbuild] Required by "DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL".
474-
[msbuild] Required by "System.Net.Http, Version=4.0.30319.18408 built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL built by: FX451RTMGREL, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL".
475475
[msbuild] Required by "SharpZipLib, Version=0.81.0.1407, Culture=neutral".
476476
[msbuild] This reference is not "CopyLocal" because it's a prerequisite file.
477477
[msbuild] The ImageRuntimeVersion for this reference is "v4.0.30319".
@@ -1969,7 +1969,7 @@ compile.projects:
19691969
[msbuild] 0 Warning(s)
19701970
[msbuild] 0 Error(s)
19711971
[msbuild]
1972-
[msbuild] Time Elapsed 00:00:01.80
1972+
[msbuild] Time Elapsed 00:00:01.79
19731973

19741974
make.doc:
19751975

@@ -1980,11 +1980,11 @@ compileandpackage:
19801980

19811981
read.version:
19821982

1983-
[echo] shortVersion: 04.05.00
1984-
[echo] version: 4.5.0.0
1983+
[echo] shortVersion: 04.05.01
1984+
[echo] version: 4.5.1.0
19851985
[echo] major: 04
19861986
[echo] minor: 05
1987-
[echo] build: 00
1987+
[echo] build: 01
19881988

19891989
make.codestats:
19901990

@@ -2052,7 +2052,7 @@ make.codestats:
20522052
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\Services\LocalizationEditorAuthorizeAttribute.vb Totals: [T] 140 [C] 1 [E] 20
20532053
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\Extensions.vb Totals: [T] 12 [C] 0 [E] 2
20542054
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\Globals.vb Totals: [T] 809 [C] 185 [E] 87
2055-
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\ModuleBase.vb Totals: [T] 77 [C] 17 [E] 15
2055+
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\ModuleBase.vb Totals: [T] 78 [C] 17 [E] 15
20562056
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Components\ModuleSettings.vb Totals: [T] 113 [C] 17 [E] 19
20572057
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Controls\Editor.ascx Totals: [T] 19 [C] 0 [E] 0
20582058
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Controls\Editor.ascx.designer.vb Totals: [T] 64 [C] 44 [E] 9
@@ -2095,11 +2095,11 @@ make.codestats:
20952095
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Users.ascx Totals: [T] 77 [C] 0 [E] 0
20962096
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Users.ascx.designer.vb Totals: [T] 114 [C] 85 [E] 14
20972097
[codestats] E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\Users.ascx.vb Totals: [T] 127 [C] 25 [E] 27
2098-
[codestats] Totals: [VB] [T] 14683 [C] 3680 [E] 1926
2098+
[codestats] Totals: [VB] [T] 14684 [C] 3680 [E] 1926
20992099

21002100
check.sqlscripts:
21012101

2102-
[echo] Version: 04.05.00
2102+
[echo] Version: 04.05.01
21032103

21042104
make.package:
21052105

@@ -2116,7 +2116,7 @@ make.package:
21162116
[copy] Copying 1 file to 'D:\Programs\Nant\Build\Package'.
21172117
[copy] Copying 20 files to 'D:\Programs\Nant\Build\Package'.
21182118
[echo] Transforming E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Installation\DNNEurope.LocalizationEditor.dnn with dnn5.xsl
2119-
[zip] Zipping 25 files to 'E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Packages\DNNEurope.Modules.LocalizationEditor_04.05.00_Install.zip'.
2119+
[zip] Zipping 25 files to 'E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Packages\DNNEurope.Modules.LocalizationEditor_04.05.01_Install.zip'.
21202120
[delete] Deleting directory 'D:\Programs\Nant\Build\Package'.
21212121
[echo] Building SOURCE
21222122

@@ -2129,7 +2129,7 @@ make.package:
21292129
[copy] Copying 1 file to 'D:\Programs\Nant\Build\Package'.
21302130
[copy] Copying 20 files to 'D:\Programs\Nant\Build\Package'.
21312131
[echo] Transforming E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Installation\DNNEurope.LocalizationEditor.dnn with dnn5.xsl
2132-
[zip] Zipping 25 files to 'E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Packages\DNNEurope.Modules.LocalizationEditor_04.05.00_Source.zip'.
2132+
[zip] Zipping 25 files to 'E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_Packages\DNNEurope.Modules.LocalizationEditor_04.05.01_Source.zip'.
21332133
[delete] Deleting directory 'D:\Programs\Nant\Build\Package'.
21342134

21352135
all:
@@ -2140,16 +2140,16 @@ backup.project:
21402140
[echo] Backing Up to \\192.168.123.240\src
21412141
[echo] Backing Up to D:\src
21422142
[echo] Backing Up Install
2143-
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Install.zip'.
2143+
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Install.zip'.
21442144
[echo] Backing Up Source
2145-
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Source.zip'.
2145+
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Source.zip'.
21462146
[echo] Backing Up to G:\src
21472147
[echo] Backing Up Install
2148-
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Install.zip'.
2148+
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Install.zip'.
21492149
[echo] Backing Up Source
2150-
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Source.zip'.
2150+
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Source.zip'.
21512151

21522152
BUILD SUCCEEDED
21532153

2154-
Total time: 32.7 seconds.
2154+
Total time: 34.2 seconds.
21552155

_Installation/Changelog.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,7 @@
8989
<change type="New Feature">New authentication method for services using an "Access Key" to overcome limitations in new DNN 7.2 services framework</change>
9090
<change type="Fix">Fix for object names with spaces in them</change>
9191
</release>
92+
<release version="04.05.01">
93+
<change type="Fix">Fix to UI to show DNN dialogs</change>
94+
</release>
9295
</changelog>

0 commit comments

Comments
 (0)