yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

Browse Source
This commit is contained in:
Morten Christensen
2013-09-02 09:53:42 +02:00
parent 20b4975cfb a535a4c96f
commit 969dece8fc
7 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
View File

@@ -3,6 +3,7 @@ using System.Data;
using System.Linq;
using System.Reflection;
using Umbraco.Core.Persistence.DatabaseAnnotations;
using Umbraco.Core.Persistence.SqlSyntax;
namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
{
@@ -107,6 +108,12 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
var constraintAttribute = propertyInfo.FirstAttribute<ConstraintAttribute>();
if (constraintAttribute != null)
{
//Special case for MySQL as it can't have multiple default DateTime values, which
//is what the umbracoServer table definition is trying to create
if (SqlSyntaxContext.SqlSyntaxProvider is MySqlSyntaxProvider && definition.TableName == "umbracoServer" &&
definition.TableName.ToLowerInvariant() == "lastNotifiedDate".ToLowerInvariant())
return definition;
definition.ConstraintName = constraintAttribute.Name ?? string.Empty;
definition.DefaultValue = constraintAttribute.Default ?? string.Empty;
}

11
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -2142,16 +2142,15 @@
</Content>
<Content Include="Umbraco\Scripting\templates\cshtml\MultinodeTree-picker.cshtml" />
<Content Include="Umbraco\Scripting\templates\cshtml\TwitterFeed.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\Login.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\EmptyTemplate.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\RegisterMember.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\LoginStatus.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\EditProfile.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\EmptyTemplate.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\Login.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\LoginStatus.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\RegisterMember.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\EmptyTemplate %28ForUseWithCustomViews%29.cshtml">
<SubType>Code</SubType>
</Content>
<None Include="Umbraco_client\CodeMirror\js\mode\coffeescript\LICENSE" />
<None Include="Umbraco_client\CodeMirror\js\mode\pascal\LICENSE" />
<None Include="Umbraco_client\CodeMirror\js\mode\perl\LICENSE" />
@@ -2609,8 +2608,8 @@
<Folder Include="MasterPages\" />
<Folder Include="Media\" />
<Folder Include="Scripts\" />
<Folder Include="Umbraco_Client\FolderBrowser\Images\" />
<Folder Include="Umbraco_Client\Tags\images\" />
<Folder Include="Umbraco_client\FolderBrowser\Images\" />
<Folder Include="Umbraco_client\Tags\images\" />
<Folder Include="UserControls\" />
<Folder Include="Views\MacroPartials\" />
<Folder Include="Views\Partials\" />

1
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate (ForUseWithCustomViews).cshtml Normal file
View File

@@ -0,0 +1 @@
@inherits Umbraco.Web.Mvc.UmbracoViewPage<dynamic>

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
View File

@@ -1 +1 @@
@inherits Umbraco.Web.Mvc.UmbracoViewPage<dynamic>
@inherits Umbraco.Web.Mvc.UmbracoTemplatePage

8
src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs
View File

@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using Umbraco.Core.IO;
using Umbraco.Web.UI.Install.Steps.Skinning;
using Umbraco.Web.UI.Pages;
@@ -24,9 +21,9 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
private void ShowStarterKits()
{
if (Directory.Exists(this.Server.MapPath(SystemDirectories.Install)) == false)
if (Directory.Exists(Server.MapPath(SystemDirectories.Install)) == false)
{
this.InstallationDirectoryNotAvailable.Visible = true;
InstallationDirectoryNotAvailable.Visible = true;
StarterKitNotInstalled.Visible = false;
StarterKitInstalled.Visible = false;
@@ -41,7 +38,6 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
StarterKitNotInstalled.Visible = true;
StarterKitInstalled.Visible = false;
InstallationDirectoryNotAvailable.Visible = true;
}

10
src/Umbraco.Web.UI/umbraco_client/DateTimePicker/timepicker.js
View File

@@ -62,9 +62,19 @@ $.datepicker._connectDatepicker = function(target, inst) {
*/
$.datepicker._showDatepickerOverride = $.datepicker._showDatepicker;
$.datepicker._showDatepicker = function (input) {
// keep the current value
var originalval = input.value;
// Keep the first 10 chars for now yyyy-mm-dd - this removes the time part which was breaking the standardDatePicker parsing code
input.value = originalval.length>10 ? originalval.substring(0, 10) : originalval;
// Call the original method which will show the datepicker
$.datepicker._showDatepickerOverride(input);
// Put it back
input.value = originalval;
input = input.target || input;
// find from button/image trigger

6
src/Umbraco.Web/Security/WebSecurity.cs
View File

@@ -70,15 +70,15 @@ namespace Umbraco.Web.Security
var allowGroupsList = allowGroups as IList<string> ?? allowGroups.ToList();
if (allowAction && allowGroupsList.Any(allowGroup => allowGroup != string.Empty))
{
// Allow only if member's type is in list
// Allow only if member is assigned to a group in the list
var groups = Roles.GetRolesForUser(member.LoginName);
allowAction = groups.Select(s => s.ToLowerInvariant()).Intersect(groups.Select(myGroup => myGroup.ToLowerInvariant())).Any();
allowAction = allowGroupsList.Select(s => s.ToLowerInvariant()).Intersect(groups.Select(myGroup => myGroup.ToLowerInvariant())).Any();
}
// If specific members defined, check member is of one of those
if (allowAction && allowMembers.Any())
{
// Allow only if member's type is in list
// Allow only if member's Id is in the list
allowAction = allowMembers.Contains(member.Id);
}
}