swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from kjac/multiple-open-fieldsets

Browse Source 
Enable multiple open fieldsets by datatype configuration. It's default enabled on newly created Archetypes.
This commit is contained in:
Kenn Jacobsen
2017-06-11 22:08:48 +02:00
committed by GitHub
parent 7d01be305f 349d6f69b3
commit 1ba45969ee
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
+3
View File
@@ -25,6 +25,9 @@ namespace Archetype.Models
[JsonProperty("enableCollapsing")]
public bool EnableCollapsing { get; set; }
[JsonProperty("enableMultipleOpen")]
public bool EnableMultipleOpen { get; set; }
[JsonProperty("enableCloning")]
public bool EnableCloning { get; set; }
app/controllers/config.controller.js
+1 -1
View File
@@ -6,7 +6,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
//define empty items
var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}';
var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableMultipleOpen": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');
//ini the model
$scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
app/controllers/controller.js
+14 -11
View File
@@ -597,17 +597,17 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
return;
}
var iniState;
if(fieldset)
// collapse all other fieldsets if "multiple open fieldsets" is not enabled
if(!$scope.model.config.enableMultipleOpen)
{
iniState = fieldset.collapse;
_.each($scope.model.value.fieldsets, function (f) {
if(f != fieldset)
{
f.collapse = true;
}
});
}
_.each($scope.model.value.fieldsets, function(fieldset){
fieldset.collapse = true;
});
if(!fieldset && $scope.model.value.fieldsets.length == 1)
{
$scope.model.value.fieldsets[0].collapse = false;
@@ -615,10 +615,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
return;
}
if(iniState && fieldset)
if(fieldset)
{
fieldset.collapse = !iniState;
$scope.loadedFieldsets.push(fieldset);
fieldset.collapse = !fieldset.collapse;
if($scope.loadedFieldsets.indexOf(fieldset) < 0)
{
$scope.loadedFieldsets.push(fieldset);
}
}
}
app/views/archetype.config.fieldset.dialog.html
+3
View File
@@ -11,6 +11,9 @@
<div>
<label for="archetypeAdvancedOptionsCollapsing"><input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="dialogData.model.enableCollapsing"/><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
</div>
<div>
<label for="archetypeAdvancedOptionsMultipleOpen"><input type="checkbox" id="archetypeAdvancedOptionsMultipleOpen" ng-model="dialogData.model.enableMultipleOpen" /><archetype-localize key="enableMultipleOpen">Enable Multiple Open Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleOpenDescription">When fieldset collapsing is enabled, this allows multiple fieldsets to be open at the same time.</archetype-localize></small></label>
</div>
<div>
<label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
<input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="dialogData.model.maxFieldsets"/>