Odd, missing config files crashed the site

This commit is contained in:
perploug
2013-10-04 11:18:57 +02:00
parent 0b907d4ae3
commit 418a29cbbf
5 changed files with 28 additions and 13 deletions

View File

@@ -12,23 +12,33 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
eventsService.publish("Umbraco.Dialogs.LinkPickerController.Select", args).then(function(args){
var c = $(args.event.target.parentElement);
//clearing
if($scope.selectedEl){
$scope.selectedEl.find(".temporary").remove();
$scope.selectedEl.find("i.umb-tree-icon").show();
}
c.find("i.umb-tree-icon")
.hide()
.after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
$scope.selectedEl = c;
$scope.target = args.node;
$scope.target.title = args.node.name;
//renewing
if(c !== $scope.selectedEl){
c.find("i.umb-tree-icon")
.hide()
.after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
$scope.selectedEl = c;
if(args.node.id < 0){
$scope.target.url = "/";
$scope.target = args.node;
$scope.target.title = args.node.name;
if(args.node.id < 0){
$scope.target.url = "/";
}else{
$scope.target.url = contentResource.getNiceUrl(args.node.id);
}
}else{
$scope.target.url = contentResource.getNiceUrl(args.node.id);
//resetting
$scope.selectedEl = null;
$scope.target = {};
}
});

View File

@@ -5,7 +5,9 @@
<input type="text"
placeholder="Enter url"
class="umb-editor umb-textstring"
ng-model="target.url" />
ng-model="target.url"
ng-disabled="target.id"
/>
</umb-control-group>
<umb-control-group label="Title">
<input type="text"

View File

@@ -623,6 +623,7 @@
<DependentUpon>404handlers.config</DependentUpon>
</None>
<Content Include="Config\appSettings.Release.config" />
<Content Include="Config\appSettings.config" />
<None Include="Config\ClientDependency.Release.config">
<DependentUpon>ClientDependency.config</DependentUpon>
<SubType>Designer</SubType>
@@ -634,6 +635,7 @@
<DependentUpon>BaseRestExtensions.config</DependentUpon>
</None>
<Content Include="Config\connectionStrings.Release.config" />
<Content Include="Config\connectionStrings.config" />
<None Include="Config\log4net.Release.config">
<DependentUpon>log4net.config</DependentUpon>
</None>

View File

@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
<clientDependency version="22" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<clientDependency version="23" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<!--
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.

View File

@@ -116,7 +116,8 @@ namespace Umbraco.Web.Editors
/// <returns></returns>
public string GetNiceUrl(int id)
{
return Umbraco.NiceUrl(id);
var url = Umbraco.NiceUrl(id);
return url;
}
/// <summary>