Commit Graph

356 Commits

Author SHA1 Message Date
cankoluman 1ba1fa2d83 Issue #AR-3_IEnumerable_support: added compound model regression tests 2014-05-09 14:42:31 +01:00
cankoluman 7c02539751 Issue #AR-3_IEnumerable_support: re-factor regression tests 2014-05-09 13:05:04 +01:00
cankoluman bc6fff6f73 Issue #AR-3_IEnumerable_support: regression testing - fixed issue where the default fieldset name was not assigned properly during dynamic model generation 2014-05-09 11:14:39 +01:00
cankoluman 911a74e43e Issue #AR-3_IEnumerable_support: regression testing - fixes to [AsFieldset] handling,
- use ExpandoObject for all dynamically generated models
- add additional JToken parsers
- To Do: deal with multiple item fieldset
2014-05-08 16:56:51 +01:00
cankoluman 934df00281 Issue #AR-3_IEnumerable_support: start on regression tests. 2014-05-07 17:03:08 +01:00
cankoluman df8d3a8888 Issue #AR-3_IEnumerable_support: clean-up 2014-05-07 15:37:57 +01:00
cankoluman e341732f83 Issue #AR-3_IEnumerable_support: move complex model tests to sub-folder 2014-05-07 14:24:35 +01:00
cankoluman 6c5a5c8393 Issue #AR-3_IEnumerable_support: add missing tests 2014-05-07 14:17:14 +01:00
cankoluman 5e23d845d5 Issue #AR-3_IEnumerable_support: apply naming convention to unit tests 2014-05-07 14:11:26 +01:00
cankoluman 11befe727c Issue #AR-3_IEnumerable_support: all tests passing - but branching logic is difficult. 2014-05-07 13:01:07 +01:00
cankoluman ed9ba7d41f Issue #AR-3_IEnumerable_support: add IEnumerable deserialization - tests pass.
However, some regression errors in compex model use case
2014-05-06 16:54:08 +01:00
cankoluman 1ae967e002 Issue #AR-3_IEnumerable_support: add IEnumerable serialization support - Captions serialization tests passing.
- needs cleaning up.
2014-05-06 15:01:50 +01:00
cankoluman 72303c1c83 Issue #AR-3_IEnumerable_support: fix json for simple list model - simple list model passes 2014-05-06 12:13:37 +01:00
cankoluman bc6580995a Issue #AR-3_IEnumerable_support: re-factor tests, add Enumerable tests - all failing as baseline. 2014-05-06 11:39:10 +01:00
cankoluman 52ff09f089 Merge remote-tracking branch 'origin/dev/AR-2_property_value_converters' into dev/AR-1_serialization 2014-05-01 16:51:16 +01:00
cankoluman 34e65ba57e Issue #AR-1_property_value_converters: switched to using Archetype's native GetValue<T> when getting property values,
- added umbracoSettings.config to the test project: conversion of decimal numbers, e.g. '12345.34' triggers
'NormalizeNumberDecimalSeparator' which in turn requires via 'DefaultShortStringHelper' that the umbracoSettings.config file is loaded. We added this to make sure tests deserializing decimal numbers pass.
2014-05-01 16:13:19 +01:00
cankoluman 87da7e1243 Issue #AR-1_serialization: fix tests that were failing due to changes in line-end encodings. 2014-05-01 14:24:26 +01:00
cankoluman ed86255cf0 Merge branch 'master' into dev/AR-1_serialization
Conflicts:
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
2014-05-01 14:17:39 +01:00
cankoluman 518f68951d Merge remote-tracking branch 'upstream/master' 2014-05-01 14:12:17 +01:00
Kevin Giszewski 6ea44c271d Use a count on the add button rather than checking flag 2014-04-30 10:00:15 -04:00
Tom Fulton 848d25a156 Show "remove" button when MaxFieldsets = 1 and Multiple Fieldset Types
... so the user can switch types (remove/add) when only a single row.

We check for Multiple Fieldset Types as well, because we don't want to show a "remove" button when there's only one type allowed (presumably).
2014-04-29 19:52:23 -06:00
Tom Fulton b4fc3e1cd3 Persist without formatting/whitespace 2014-04-29 18:34:25 -06:00
Tom Fulton 0547c4c07e Ensure we only save the "cleaned" model to the DB
* Extract the model cleaning logic to a method for re-use
* Call cleaning method from ConvertEditorToDb  (we were only calling on ConvertDbToString (cache))
* Update ConvertDbToEditor to route through new deserialization helper, so that it gets the "virtual" properties it needs that were lost in the cleaning
2014-04-29 18:18:14 -06:00
Kevin Giszewski 86f2f180bf Fix defaultPreValue import
- Remove MNTP hack
2014-04-29 16:23:55 -04:00
Kevin Giszewski 62a9ff05b9 Hide the Add button when multiple fieldsets enabled 2014-04-29 14:35:48 -04:00
Kevin Giszewski ce05dbb845 Remove logging 2014-04-29 14:25:34 -04:00
Kevin Giszewski 8ce8454620 Add a hack to make the MNTP multipicker work 2014-04-29 14:23:58 -04:00
Kevin Giszewski d13a5b1b86 Remove RenderModel
- Use server side converters for model cleanup
2014-04-29 12:31:02 -04:00
cankoluman a6b1abaecc Issue #AR-1_serialization: removed ArchetypeJsonConverter type argument - which is no longer needed 2014-04-29 11:47:59 +01:00
cankoluman 258b0859ab Issue #AR-1_serialization: clean up 2014-04-29 11:28:30 +01:00
cankoluman cee7d73b01 Issue #AR-1_serialization: finish tests for complex tree model use case 2014-04-29 11:23:39 +01:00
cankoluman 1e12b82742 Issue #AR-1_serialization: fix deserialization for complex models (i.e. models employing AsFiedlset hinting) 2014-04-29 10:06:22 +01:00
Tom Fulton 3b5cff8d9a Completely remove package.manifest in favor of C# declaration 2014-04-28 23:53:07 -06:00
Tom Fulton f214785cfa Merge branch 'wip/106-amend-3' into 106-update
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-28 23:47:39 -06:00
Tom Fulton 61d0b67118 Merge branch '106' into 106-update
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-28 23:46:51 -06:00
Tom Fulton 7a71afda0e GetValue - *always* check the PropertyValueConverters
Even if we want a string and the value is already a string, we should still hit the PropertyValueConverters for situations like the RTE's PVC, which performs parsing on the content.
2014-04-28 23:39:32 -06:00
Tom Fulton 4ad88a04e5 Misc cleanup 2014-04-28 23:37:39 -06:00
Tom Fulton 6f281080e8 Route new Convert* methods through Helper, refactor
This fixes the issue where the model sent to ConvertEditorToDb doesn't have a DataTypeGuid, thus we were unable to look up the correct PropertyEditor to run the Convert methods on.
2014-04-28 23:30:32 -06:00
cankoluman 7b5d9b4dd5 Issue #AR-1_serialization: clarify deserialization logic 2014-04-28 14:54:47 +01:00
cankoluman 766ae0a8df Issue #AR-1_serialization: removed hardcoded fieldsets[0].properties restriction 2014-04-28 14:32:34 +01:00
cankoluman 43e1855b2c Issue #AR-1_serialization: fix regression error, added AsFieldsetAttribute to help resolve ambiguous complex models, some renaming 2014-04-28 12:45:30 +01:00
Tom Fulton e2341e8bb5 Merge branch 'feature/rte-macro-fix' of github.com:mattbrailsford/Archetype into wip/106-amend-3
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-27 23:07:26 -06:00
Tom Fulton 55bb2e49e5 Merge pull request #108 from imulus/pvc-refactor
Extract methods from ValueConverter for reuse
2014-04-27 22:55:15 -06:00
cankoluman cbec133186 Issue #AR-1_serialization: added serialization wrappers, and support for complex model serialization,
- see test examples
2014-04-25 17:34:56 +01:00
Tom Fulton ff4b5da163 Merge branch 'pvc-refactor' of github.com:imulus/Archetype into pvc-refactor 2014-04-24 23:12:05 -06:00
Tom Fulton ea017fa6cd Make tests pass
Quick null check for PublishedPropertyType - we can't create a dummy one from a test due to some internal Umbraco dependencies, and we can't mock it as the relevant properties aren't virtual, so just adding a quick null check for now.
2014-04-24 23:11:47 -06:00
Tom Fulton 7a29683008 Mark helper methods internal for now 2014-04-24 22:44:37 -06:00
Tom Fulton f52bbc2d0a Extract methods to retrieve metadata not stored in the model 2014-04-24 22:39:22 -06:00
Tom Fulton fa174ba15a Move deserialization methods to a Helper class 2014-04-24 22:29:58 -06:00
Tom Fulton a3a275808e Small refactorings to ConvertDataSource via @leekelleher
Manually merged in from: https://github.com/leekelleher/Archetype/blob/79bace6b882ec6bd291cc395be57336f8df26b0b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-24 22:05:52 -06:00