Skip to content

Commit

Permalink
Fix to UI to show DNN dialogs which appeared to work in dev but didn'…
Browse files Browse the repository at this point in the history
…t in production
  • Loading branch information
donker committed Feb 2, 2014
1 parent 0becb92 commit f3df8c5
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 26 deletions.
1 change: 1 addition & 0 deletions Components/ModuleBase.vb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Public Class ModuleBase
If ModulePermissionController.HasModulePermission(Me.ModuleConfiguration.ModulePermissions, "EDIT") Then
IsAdmin = True
End If
DotNetNuke.Framework.jQuery.RequestDnnPluginsRegistration()
End Sub
#End Region

Expand Down
2 changes: 1 addition & 1 deletion DNNEurope.LocalizationEditor.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<Name>System.Data</Name>
<Private>False</Private>
</Reference>
<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">
<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">
<SpecificVersion>False</SpecificVersion>
<HintPath>_References\System.Net.Http.dll</HintPath>
<Private>False</Private>
Expand Down
2 changes: 1 addition & 1 deletion LocalizationEditor.ascx.vb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Partial Public Class LocalizationEditor
cmdClearCaches.Visible = IsAdmin And Me.Settings.CachePacks
cmdUploadPack.Visible = IsAdmin Or IsEditor
cmdCube.Visible = Settings.AllowDataExtract
cmdService.Visible = IsEditor
cmdService.Visible = CBool(UserPermissions.Count > 0)

If Not Me.IsPostBack Then

Expand Down
6 changes: 3 additions & 3 deletions My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:

<Assembly: AssemblyVersion("04.05.00")>
<Assembly: AssemblyFileVersionAttribute("04.05.00")>
<Assembly: AssemblyInformationalVersion("04.05.00")>
<Assembly: AssemblyVersion("04.05.01")>
<Assembly: AssemblyFileVersionAttribute("04.05.01")>
<Assembly: AssemblyInformationalVersion("04.05.01")>

'History
'03.00.00 2009-08-10 Janga: User Interface.
Expand Down
2 changes: 1 addition & 1 deletion _BuildSupport/Projects.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DNNEurope.LocalizationEditor.vbproj;04.05.00
DNNEurope.LocalizationEditor.vbproj;04.05.01
40 changes: 20 additions & 20 deletions _BuildSupport/Report.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set.buildvars:

set.versions:

[echo] Set Version 04.05.00 on DNNEurope.LocalizationEditor.vbproj
[echo] Set Version 04.05.01 on DNNEurope.LocalizationEditor.vbproj
Checking ..\My Project\AssemblyInfo.vb
Checking ..\_Installation\DNNEurope.LocalizationEditor.dnn
Reset References to _References\
Expand All @@ -57,8 +57,8 @@ Adjusting 'Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral'
Adjusting Path 'Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral'
Adjusting 'SharpZipLib, Version=0.81.0.1407, Culture=neutral'
Adjusting Path 'SharpZipLib, Version=0.81.0.1407, Culture=neutral'
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'
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'
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'
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'
Adjusting 'System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
Adjusting Path 'System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
Adjusting 'System.Web.WebPages, Version=2.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'
Expand All @@ -71,7 +71,7 @@ clean.bindirectory:
compile.projects:

[echo] Building DNNEurope.LocalizationEditor.vbproj
[msbuild] Build started 01/02/2014 23:06:00.
[msbuild] Build started 02/02/2014 09:40:34.
[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".
[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".
[msbuild] Project "E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\DNNEurope.LocalizationEditor.vbproj" on node 1 (Rebuild target(s)).
Expand Down Expand Up @@ -271,7 +271,7 @@ compile.projects:
[msbuild] Private = 'False'
[msbuild] System.Data
[msbuild] Private = 'False'
[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
[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
[msbuild] Private = 'False'
[msbuild] HintPath = '_References\System.Net.Http.dll'
[msbuild] SpecificVersion = 'False'
Expand Down Expand Up @@ -464,14 +464,14 @@ compile.projects:
[msbuild] Considered "E:\Webroot\LEDEV\DesktopModules\DNNEurope\LocalizationEditor\_References\mscorlib.exe", but it didn't exist.
[msbuild] For SearchPath "{TargetFrameworkDirectory}".
[msbuild] Considered "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.winmd", but it didn't exist.
[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".
[msbuild] Required by "System.Web.WebPages, Version=2.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL".
[msbuild] Required by "System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL".
[msbuild] Required by "DotNetNuke, Version=7.0.0.1586, Culture=neutral, processorArchitecture=MSIL".
[msbuild] Required by "Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral".
[msbuild] Required by "GoogleTranslateAPI, Version=0.2.0.0, Culture=neutral, PublicKeyToken=37a8e65b17fcdcbb, processorArchitecture=MSIL".
[msbuild] Required by "DotNetNuke.Web, Version=7.0.0.1586, Culture=neutral, processorArchitecture=MSIL".
[msbuild] Required by "DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL".
[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".
[msbuild] Required by "SharpZipLib, Version=0.81.0.1407, Culture=neutral".
[msbuild] This reference is not "CopyLocal" because it's a prerequisite file.
[msbuild] The ImageRuntimeVersion for this reference is "v4.0.30319".
Expand Down Expand Up @@ -1969,7 +1969,7 @@ compile.projects:
[msbuild] 0 Warning(s)
[msbuild] 0 Error(s)
[msbuild]
[msbuild] Time Elapsed 00:00:01.80
[msbuild] Time Elapsed 00:00:01.79

make.doc:

Expand All @@ -1980,11 +1980,11 @@ compileandpackage:

read.version:

[echo] shortVersion: 04.05.00
[echo] version: 4.5.0.0
[echo] shortVersion: 04.05.01
[echo] version: 4.5.1.0
[echo] major: 04
[echo] minor: 05
[echo] build: 00
[echo] build: 01

make.codestats:

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

check.sqlscripts:

[echo] Version: 04.05.00
[echo] Version: 04.05.01

make.package:

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

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

all:
Expand All @@ -2140,16 +2140,16 @@ backup.project:
[echo] Backing Up to \\192.168.123.240\src
[echo] Backing Up to D:\src
[echo] Backing Up Install
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Install.zip'.
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Install.zip'.
[echo] Backing Up Source
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Source.zip'.
[copy] Copying 1 file to 'D:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Source.zip'.
[echo] Backing Up to G:\src
[echo] Backing Up Install
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Install.zip'.
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Install.zip'.
[echo] Backing Up Source
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-1\DNNEurope.Modules.LocalizationEditor_04.05.00_Source.zip'.
[copy] Copying 1 file to 'G:\src\LocalizationEditor\2014-2-2\DNNEurope.Modules.LocalizationEditor_04.05.01_Source.zip'.

BUILD SUCCEEDED

Total time: 32.7 seconds.
Total time: 34.2 seconds.

3 changes: 3 additions & 0 deletions _Installation/Changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,7 @@
<change type="New Feature">New authentication method for services using an "Access Key" to overcome limitations in new DNN 7.2 services framework</change>
<change type="Fix">Fix for object names with spaces in them</change>
</release>
<release version="04.05.01">
<change type="Fix">Fix to UI to show DNN dialogs</change>
</release>
</changelog>

0 comments on commit f3df8c5

Please sign in to comment.