Commit Graph

242 Commits

Author SHA1 Message Date
Kevin Giszewski 4014583ade Merge branch 'pr/124' into develop 2014-05-12 12:45:45 -04:00
Kevin Giszewski 9a0e40b489 Rename Model Files 2014-05-12 12:44:18 -04:00
Kevin Giszewski 5c60c109d5 Expose current form to nested Archetypes 2014-05-12 12:43:38 -04:00
Kevin Giszewski bdb3655418 Merge branch 'develop' into pr/124 2014-05-12 10:50:41 -04:00
Kevin Giszewski 0d766c1ad9 Merge branch 'develop' into pr/122 2014-05-12 09:55:54 -04:00
kjac e2c7e9b0ef Issue #116: Add RegEx validation support
Add RegEx validation for the individual properties in a fieldset as
proposed in issue #116
2014-05-11 10:39:12 +02:00
kjac 62964dcfae Update fix for issue #121 + fix issue #123
Use the built-in dirty state to handle row changes instead of the custom
state variable introduced in the previous commit.
Additionally this solves issue #123 by setting the dirty state when rows
are removed or sorted.
2014-05-10 22:29:56 +02:00
kjac a48033874a Fix issue #121
Stop prompting the editor to save unsaved changes after saving.
2014-05-10 17:25:16 +02:00
Kevin Giszewski ecb933d13a Update folder name in sln 2014-05-09 12:06:18 -04:00
Kevin Giszewski 45ccf6e06d Update folder name 2014-05-09 12:05:43 -04:00
Kevin Giszewski b0118f4bdb Add in DatabaseSizer
- Temp DLL to not be included in dist
2014-05-09 12:04:23 -04:00
Kevin Giszewski 7fd1b69e81 Update packages to v7.1.2
- Also last commit
2014-05-09 12:03:31 -04:00
Kevin Giszewski b67e150fe1 Merge in 2014-05-09 12:02:45 -04:00
Kevin Giszewski 1cbc192a9d Update naming scheme 2014-05-08 17:47:24 -04:00
Kevin Giszewski 4fff98640e Remove filter as .remove is no longer an attribute 2014-05-08 13:32:55 -04:00
Kevin Giszewski 085ff2cecf Add dropdown to add button 2014-05-08 13:32:04 -04:00
Kevin Giszewski d72a000d68 Remove Toolbar
- Fix insert index issue
2014-05-08 12:58:48 -04:00
Kevin Giszewski 2fc8845851 Merge branch 'master' into pr/115 2014-05-08 11:04:06 -04:00
leekelleher bd617162f1 Disabled "Copy Local" for 3rd-party assembly references. 2014-05-07 15:09:55 +01:00
Kevin Giszewski 688ad534f2 Check for config for label template 2014-05-06 13:00:05 -04:00
Tom Fulton 059d951a21 Don't use dropdown menu when only 1 fieldset type 2014-05-04 16:39:56 -06:00
Tom Fulton 6dc5841f31 Stylize dropdown menu 2014-05-04 16:21:19 -06:00
Tom Fulton 91fc5bbd7f Fix rows not being added in correct position 2014-05-04 15:59:01 -06:00
Tom Fulton 3742147cf7 Merge branch 'master' into feature/add-dropdown
Conflicts:
	app/views/archetype.html
2014-05-04 15:58:00 -06:00
Kevin Giszewski b7a8f5f581 Add try/catch with logging to prop converters 2014-05-02 09:20:59 -04: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
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
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 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 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
mattbrailsford 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
Kevin Giszewski 5aeef0383c Bump dll version 2014-04-18 17:34:35 -04:00
Kevin Giszewski 3160f8ce8f Use an extension to parse the RTE macros into rendered macros 2014-04-18 17:27:19 -04:00
Kevin Giszewski da4383181c Bump the version number 2014-04-14 15:02:06 -04:00
Kevin Giszewski 25e8db9443 Update core refs to v7.1.1 2014-04-14 15:00:59 -04:00
Tom Fulton 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