From e4f3081da298a1cf4f5aeb71093a1507426066f4 Mon Sep 17 00:00:00 2001 From: Ismail Mayat Date: Thu, 25 Oct 2012 08:21:47 -0100 Subject: [PATCH 1/5] U4-998 Saving a User Type - speech bubble says "User Saved" --- .../umbraco.presentation/umbraco/users/EditUserType.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs index 50ff09376b..c784a9bebe 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs @@ -70,7 +70,7 @@ namespace umbraco.cms.presentation.user userType.DefaultPermissions = actions; userType.Save(); - speechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editUserSaved", base.getUser()), ""); + speechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editUserTypeSaved", base.getUser()), ""); } protected List CurrentUserTypeActions From b517d59beeac58a3dd68eabfaf2e3f28dcc1c0ed Mon Sep 17 00:00:00 2001 From: Ismail Mayat Date: Thu, 25 Oct 2012 08:38:25 -0100 Subject: [PATCH 2/5] U4-998Saving a User Type - speech bubble says "User Saved" --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index bc9c86e843..30cd5d9dc5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -685,6 +685,7 @@ To manage your website, simply open the umbraco back office and start adding con Template saved Error saving user (check log) User Saved + User type saved File not saved file could not be saved. Please check file permissions File saved From 33e73ab965b45c5dd4846adc97c2e0e263b4593f Mon Sep 17 00:00:00 2001 From: "NielsHartvig@UMBRACORATI.localdomain" Date: Thu, 25 Oct 2012 08:37:55 -0200 Subject: [PATCH 3/5] Fixes U4-802, MacroEngine should sort the built in engine first --- .../umbraco.presentation/umbraco/create/DLRScripting.ascx.cs | 2 +- .../umbraco.presentation/umbraco/editContent.aspx.cs | 2 +- src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs index 3c55f39b9f..d48b2a6675 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs @@ -25,7 +25,7 @@ namespace umbraco.presentation.create sbmt.Text = ui.Text("create"); if (!Page.IsPostBack) { foreach (MacroEngineLanguage lang in MacroEngineFactory.GetSupportedUILanguages()) { - filetype.Items.Add(new ListItem(string.Format("{0} by {1}", helper.SpaceCamelCasing(lang.Extension), lang.EngineName), lang.Extension)); + filetype.Items.Add(new ListItem(string.Format(".{0} ({1})", lang.Extension.ToLowerInvariant(), lang.EngineName), lang.Extension)); } filetype.SelectedIndex = 0; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs index d8eae26314..39b320ad26 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs @@ -462,7 +462,7 @@ namespace umbraco.cms.presentation string showPageDisabledText = ui.Text("buttons", "showPageDisabled", this.getUser()); if (showPageDisabledText.StartsWith("[")) showPageDisabledText = ui.GetText("buttons", "showPageDisabled", null, "en"); ; - menu.NewElement("PreviewDisabled", "previewDisabled", "disabled", 0); + menuItem.AltText = showPageDisabledText; ((Image) menuItem).Attributes.Add("style", "opacity: 0.5"); } diff --git a/src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs b/src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs index 714d7d56ff..aab0899de2 100644 --- a/src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs +++ b/src/umbraco.cms/businesslogic/macro/MacroEngineFactory.cs @@ -66,7 +66,7 @@ namespace umbraco.cms.businesslogic.macro if (languages.Find(t => t.Extension == lang) == null) languages.Add(new MacroEngineLanguage(lang, engine.Name)); } - return languages; + return languages.OrderBy(s => s.Extension); } public static List GetAll() From 25da44825e278d4ed2c7ed1f844ccca96d21f135 Mon Sep 17 00:00:00 2001 From: Tom Fulton Date: Thu, 25 Oct 2012 14:46:12 +0400 Subject: [PATCH 4/5] U4-377: Add code from michielvoo's pull request (trigger the dictionaryitem.saving event from dictionaryitem.setvalue() by calling its Save() method.) --- src/umbraco.cms/businesslogic/Dictionary.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs index 028dde1b58..9b248922aa 100644 --- a/src/umbraco.cms/businesslogic/Dictionary.cs +++ b/src/umbraco.cms/businesslogic/Dictionary.cs @@ -293,6 +293,9 @@ namespace umbraco.cms.businesslogic public void setValue(int languageId, string value) { + // Calling Save method triggers the Saving event + Save(); + if (Item.hasText(UniqueId, languageId)) Item.setText(languageId, UniqueId, value); else @@ -310,6 +313,9 @@ namespace umbraco.cms.businesslogic /// public void setValue(string value) { + // Calling Save method triggers the Saving event + Save(); + if (Item.hasText(UniqueId, 0)) Item.setText(0, UniqueId, value); else @@ -354,6 +360,7 @@ namespace umbraco.cms.businesslogic DictionaryItems.Remove(key); } + [Obsolete("Does not save the dictionary item, use setValue() instead.")] public void Save() { OnSaving(EventArgs.Empty); From 22f7d8797cc08c534bdba8eeab35d20b79b0afbd Mon Sep 17 00:00:00 2001 From: Tom Fulton Date: Thu, 25 Oct 2012 14:47:29 +0400 Subject: [PATCH 5/5] U4-377: Fix exception when attempting to access Value externally during a new dictionary item creation --- src/umbraco.cms/businesslogic/Dictionary.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs index 9b248922aa..3d11d9e855 100644 --- a/src/umbraco.cms/businesslogic/Dictionary.cs +++ b/src/umbraco.cms/businesslogic/Dictionary.cs @@ -304,7 +304,12 @@ namespace umbraco.cms.businesslogic public string Value() { - return Item.Text(UniqueId, 1); + if (Item.hasText(UniqueId, 1)) + { + return Item.Text(UniqueId, 1); + } + + return string.Empty; } ///