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
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
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
6ea44c271d
Use a count on the add button rather than checking flag
2014-04-30 10:00:15 -04:00
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
b4fc3e1cd3
Persist without formatting/whitespace
2014-04-29 18:34:25 -06:00
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
86f2f180bf
Fix defaultPreValue import
...
- Remove MNTP hack
2014-04-29 16:23:55 -04:00
62a9ff05b9
Hide the Add button when multiple fieldsets enabled
2014-04-29 14:35:48 -04:00
ce05dbb845
Remove logging
2014-04-29 14:25:34 -04:00
8ce8454620
Add a hack to make the MNTP multipicker work
2014-04-29 14:23:58 -04:00
d13a5b1b86
Remove RenderModel
...
- Use server side converters for model cleanup
2014-04-29 12:31:02 -04:00
a6b1abaecc
Issue #AR-1_serialization: removed ArchetypeJsonConverter type argument - which is no longer needed
2014-04-29 11:47:59 +01:00
258b0859ab
Issue #AR-1_serialization: clean up
2014-04-29 11:28:30 +01:00
cee7d73b01
Issue #AR-1_serialization: finish tests for complex tree model use case
2014-04-29 11:23:39 +01:00
1e12b82742
Issue #AR-1_serialization: fix deserialization for complex models (i.e. models employing AsFiedlset hinting)
2014-04-29 10:06:22 +01:00
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
61d0b67118
Merge branch '106' into 106-update
...
Conflicts:
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-28 23:46:51 -06:00
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
4ad88a04e5
Misc cleanup
2014-04-28 23:37:39 -06:00
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
7b5d9b4dd5
Issue #AR-1_serialization: clarify deserialization logic
2014-04-28 14:54:47 +01:00
766ae0a8df
Issue #AR-1_serialization: removed hardcoded fieldsets[0].properties restriction
2014-04-28 14:32:34 +01:00
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
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
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
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
7a29683008
Mark helper methods internal for now
2014-04-24 22:44:37 -06:00
fa174ba15a
Move deserialization methods to a Helper class
2014-04-24 22:29:58 -06:00
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
23735fdf59
Issue #AR-1_serialization: rename file
2014-04-24 17:03:30 +01:00
8c005b2ec9
Issue #AR-1_serialization: rename test models file
2014-04-24 16:23:28 +01:00
bfb1cc6abc
Issue #AR-1_serialization: add support for JsonIgnoreAttribute,
...
- re-factor names,
- move all test strings to separate class
2014-04-24 16:21:52 +01:00
ea0d641f25
Issue #AR-1_serialization: add a numerical and date model test,
...
- fix errors in deserializing nullable type values
2014-04-24 15:51:04 +01:00
67311836c8
Issue #AR-1_serialization: update json test input
2014-04-24 10:49:04 +01:00
22d596e827
Issue #AR-1_serialization: initial commit of model serializer and tests.
2014-04-24 10:43:48 +01:00
1ca8878592
Removed temp "ParseMacros" extension method
...
Removed package.manifest
Added C# property editor definition
Added initial code for handling data value conversions when accessing from / writing to datavabase / xml cache
2014-04-21 20:23:07 +01:00
5aeef0383c
Bump dll version
2014-04-18 17:34:35 -04:00
3160f8ce8f
Use an extension to parse the RTE macros into rendered macros
2014-04-18 17:27:19 -04:00
da4383181c
Bump the version number
2014-04-14 15:02:06 -04:00
25e8db9443
Update core refs to v7.1.1
2014-04-14 15:00:59 -04:00
c6a47c0036
Merge pull request #100 from leekelleher/feature/grunt-vs-tidyup
...
Changed grunt "copy:dll" to take from "Release" directory
2014-04-13 22:22:53 -06:00
9795e26f1a
Merge branch 'develop' of github.com:imulus/Archetype into develop
2014-04-10 16:48:34 -04:00
9c7cb43bb9
Translation to danish
...
...Have fun figuring out if my danish translation is good! (Just kidding!) :)
2014-04-10 22:42:45 +02:00
ac20b370fb
Amended the build script to take the assembly from the 'Release' directory.
...
Disabled "Copy Local" for 3rd-party assembly references.
2014-04-09 11:54:13 +01:00
6cc91e4359
Move cache keys to Constants
2014-04-04 17:09:42 -06:00
c883afc81f
Merge branch 'develop' into feature/clear-cache
2014-04-04 16:06:36 -06:00
1eb0aa68d2
Wrap method in GetCacheItem - missed from merge conflict in 3ffd03e34c
2014-04-04 00:06:33 -06:00
533f7d9f8f
DRY up DataTypeId lookups/caching
2014-04-04 00:04:03 -06:00
3ffd03e34c
Merge branch '91' into feature/cache
...
Conflicts:
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
Fix conflicts and update caching to match #91
2014-04-03 22:48:29 -06:00
cankoluman