Commit Graph

950 Commits

Author SHA1 Message Date
Kenn Jacobsen 7d01be305f Merge pull request #408 from kjac/fix-mandatory-validation
Fix mandatory validation: The mandatory validation implementation prevents a valid Archetype from
being submitted on the first go because the mandatory validation isn't
initialized.
2017-06-11 21:36:34 +02:00
kjac 694b932e37 Fix mandatory validation issue
The mandatory validation implementation prevents a valid Archetype from
being submitted on the first go because the mandatory validation isn't
initialized.
2017-06-11 21:35:31 +02:00
kjac 9316e7c3f6 Merge remote-tracking branch 'refs/remotes/kgiszewski/master' 2017-06-11 16:17:46 +02:00
Kenn Jacobsen 8bc6c17921 Merge pull request #407 from kjac/styling-for-7.6
Styling for 7.6: Make the "add new item" button look ok in 7.6 + hide the "drag into"
area for non cross draggable Archetypes.
2017-06-11 16:16:53 +02:00
kjac 1161c7e6da A bit of styling
Make the "add new item" button look ok in 7.6 + hide the "drag into"
area for non cross draggable Archetypes.
2017-06-11 16:14:58 +02:00
kjac 93db3eb2ee Merge remote-tracking branch 'refs/remotes/kgiszewski/master' 2017-06-11 16:07:24 +02:00
Kenn Jacobsen b7b166562f Merge pull request #406 from kjac/collapsing-dollar-signs
Collapsing dollar signs
2017-06-11 16:05:26 +02:00
kjac e3c4c91de1 Fix #387 2017-06-11 16:03:56 +02:00
kjac 42e92a4e74 Merge remote-tracking branch 'refs/remotes/kgiszewski/master' 2017-06-10 08:26:06 +02:00
Kenn Jacobsen 2c363a5d37 Merge pull request #405 from kjac/mandatory-validation
Mandatory validation - fixes #395
2017-06-09 21:19:32 +02:00
kjac 738e9282b6 Handle mandatory validation
Don't allow submission of an empty Archetype if the property is set to
mandatory
2017-06-09 21:11:11 +02:00
kjac 1cea5d156a Merge remote-tracking branch 'refs/remotes/kgiszewski/master' 2017-06-08 16:46:00 +02:00
Kenn Jacobsen 109d4c7708 Merge pull request #404 from kjac/label-templates-for-v2-pickers
Label templates for the V2 pickers
2017-06-08 16:37:50 +02:00
Kenn Jacobsen 8306be60de Merge pull request #403 from kjac/lazy-load-configuration
Lazy load configuration
2017-06-08 16:36:52 +02:00
Kenn Jacobsen 27d0cb742b Label templates for the V2 pickers
..and also for the old content picker (it was missing for whatever
reason) - fixes #402
2017-06-08 09:02:31 +02:00
kjac 62a250cd83 Lazy load fieldsets in configuration
Fixes #393
2017-06-07 23:07:40 +02:00
kjac 6f94d608db Merge remote-tracking branch 'refs/remotes/kgiszewski/master' 2017-06-07 20:56:35 +02:00
Kenn Jacobsen 854e9873c8 Merge pull request #401 from kjac/image-cropper-and-upload-76
Adjust to 7.6 scheme for upload and image croppers
2017-06-07 17:56:20 +02:00
Kenn Jacobsen 2a6d5eaddf Merge pull request #400 from kjac/fix-upload-and-image-cropper-again
Fix upload and image cropper (again)
2017-06-07 17:48:23 +02:00
kjac 3d7ddb58c2 Adjust to 7.6 scheme for upload and image croppers
Fixes #397, at least for newly created sites.
2017-06-06 23:14:40 +02:00
kjac 4c7496840d Fix upload and image cropper (again)
Fixes #384, #389 and #394
2017-06-06 22:41:04 +02:00
Kevin Giszewski d816103981 Merge pull request #399 from codedemonuk/patch-1
Subheadings were not being rendered correctly in Readme
2017-05-29 11:14:18 -04:00
Pervez Choudhury b38ccc12f6 Subheadings were not being rendered correctly 2017-05-28 17:48:44 +01:00
Kevin Giszewski e1deba5b95 Update LICENSE v1.13.2 2017-02-16 12:53:33 -05:00
Kevin Giszewski 5bce4e856a Merge pull request #386 from kgiszewski/fix-385
Fix #385
2017-02-16 12:42:55 -05:00
Kevin Giszewski 6f4cb1e609 Merge pull request #379 from leekelleher/feature/typeconverter
TypeConverter for ArchetypeModel
2017-02-16 12:42:44 -05:00
Kenn Jacobsen 033cbbc8f6 Fix #385 2017-02-16 15:05:21 +01:00
Kenn Jacobsen 7ee3cfca5c Merge pull request #378 from Nicholas-Westby/fix/372-drag-drop-broken
Fix for drag & drop failing when dropping fieldset in the same Archet…
2017-02-16 12:16:44 +01:00
Kenn Jacobsen e9b478c186 Fix #384
For some reason Umbraco has started lowercasing the names of uploaded
files. This fixes the problem by ignoring case when looking for the
uploaded files.
2017-02-15 11:17:01 +01:00
leekelleher 21e784424f TypeConverter for ArchetypeModel
Added a TypeConverter for both `ArchetypeModel` and `ArchetypeFieldsetModel`, so that they can be converted to their `IPublishedContent` equivalent.

Example usage would be, when you would typically do this...

```csharp
var items = Model.Content.GetPropertyValue<ArchetypeModel>myArchetypeAlias");
```

You can now do this...

```csharp
var items = Model.Content.GetPropertyValue<IEnumerable<IPublishedContent>>("myArchetypeAlias");
```

I know it seems more verbose, but the idea is that this could be hot-swappable with other property-editors, such as Nested Content. The frontend/code would deal purely with `IPublishedContent` objects.

---

Also included unit-tests that run via Umbraco Core's `TryConvertTo` extension method, (which is what `Content.GetPropertyValue<T>` uses internally in Umbraco).

There's a small caveat with the TypeConverter for `ArchetypeFieldsetModel`, I had to explicitly reject `typeof(string)`, otherwise the JSON deserializer fails (in `ArchetypeHelper.DeserializeJsonToArchetype`).
All other unit-tests still pass.
2016-10-19 20:26:46 +01:00
Nicholas-Westby 155355aa00 Fix for drag & drop failing when dropping fieldset in the same Archetype and the max fieldsets is reached: https://github.com/kgiszewski/Archetype/issues/372 2016-09-14 22:08:04 -07:00
kgiszewski abf6917b1c bump to v1.13.1 v1.13.1 2016-06-26 12:10:11 -04:00
kgiszewski 40ad701f7f Merge branch 'master' into pr/365 2016-06-26 12:05:18 -04:00
Kevin Giszewski a8113f926c Merge pull request #369 from kipusoep/master
Fixed #368
2016-06-16 16:21:21 -04:00
Kevin Giszewski 3c527396de Merge pull request #364 from Nicholas-Westby/fix/362-drag-fieldset-undefined
Fix for error during Archetype drags when there are rich text editors…
2016-06-16 16:12:33 -04:00
Stefan Kip 59bf66dcd1 Fixed #368 2016-06-16 20:11:02 +02:00
Nicholas-Westby c125042a86 Avoid fieldsets that can't be expanded: https://github.com/imulus/Archetype/issues/363 2016-05-20 21:38:39 -07:00
Nicholas-Westby 85ea472129 Fix for error during Archetype drags when there are rich text editors outside of Archetype: https://github.com/imulus/Archetype/issues/362 2016-05-18 20:03:05 -07:00
kgiszewski f541b50b82 Merge branch 'master' into pr/356
Conflicts:
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
	app/controllers/config.controller.js
	app/views/archetype.config.fieldset.dialog.html
v1.13.0
2016-05-13 10:07:18 -04:00
Nicholas-Westby 5767ea97d1 Workaround for .sortable("instance") not working on older versions of Umbraco. 2016-05-11 21:19:09 -07:00
Nicholas-Westby e1fa7a3271 Fixed recursion error and tidied up validation logic. 2016-05-07 15:48:39 -07:00
Nicholas-Westby c2e97e28ce Disable sortables for Archetypes that can't have the currently dragged fieldset dropped onto them. 2016-05-07 14:54:30 -07:00
Nicholas-Westby eda9bab02f Ensure the property alias is unique when dragging between Archetypes. 2016-05-07 12:45:34 -07:00
Nicholas-Westby ce3cecbec9 Fix for incorrect validation errors. 2016-05-05 21:52:03 -07:00
Nicholas-Westby ef5faae254 Allow the last fieldset to be dropped back to its origin list. 2016-05-05 21:18:08 -07:00
Nicholas-Westby 547473e92c Account for the possibility that the "tinyMCE" variable may not exist. 2016-05-05 20:20:44 -07:00
Nicholas-Westby 9857059906 Ensured the temporary ID is unique when cloning fieldsets. 2016-05-05 20:05:20 -07:00
Nicholas-Westby 7f7b054c14 Clear errors on the target Archetype too. 2016-05-04 21:28:16 -07:00
Nicholas-Westby a40d95250e Clear out errors of nested Archetypes on drop. 2016-05-04 21:15:36 -07:00
Nicholas-Westby 1e6004d3fa Another RTE fix.
Improved handling of validations when moving fieldsets (recursively mark Archetypes as valid).
2016-05-04 20:58:26 -07:00