Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implements ContentPicker localization options discussed in #7352 #7391

Merged
merged 6 commits into from
Nov 17, 2016
Merged

Implements ContentPicker localization options discussed in #7352 #7391

merged 6 commits into from
Nov 17, 2016

Conversation

MatteoPiovanelli-Laser
Copy link
Contributor

As per discussion in #7352, in this commit I created a new feature of the Orchard.ContentPicker module to implement the localization options:

  • Try to translate the items selected in the ContentPickerField to the culture of the ContentItem we are saving.
    • Remove localizable selected items that do not have a localization to the "correct" culture.
    • Remove selected items that do not have a LocalizationPart.
  • Check whether all selected items have the "correct" culture, and prevent saving if they don't.
    • Consider items without LocalizationPart as being of the "wrong" culture.

@MatteoPiovanelli-Laser
Squashed commit of the following:
6efa830 
commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46
Author: matteo.piovanelli <[email protected]>
Date:   Thu Nov 10 12:02:09 2016 +0100

    Added notifications about what the localization methods for ContentPickerField will do or have done.

commit 04eb7074dcfef2c8beb65f0322821dc654902cfb
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 17:48:59 2016 +0100

    Added the TryTranslate option and its suboptions

commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 15:31:44 2016 +0100

    Added a new feature to the ContentPicker module.
    So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture

commit b90629d
Merge: 578b21b c486355
Author: matteo.piovanelli <[email protected]>
Date:   Tue Nov 8 09:37:30 2016 +0100

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x

commit 578b21b
Merge: 395976f 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:45:51 2016 +0100

    Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x

commit 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:43:38 2016 +0100

    - replaced Regex.Replace with String.Trim(char[]) as suggested
    - ran Orchard.Tokens.Tests: 66/66 passed

commit 395976f
Merge: 708ed79 a15557e
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:34:50 2016 +0200

    Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 708ed79
Merge: 5fe0b69 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:52 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 5fe0b69
Merge: 0daad70 e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:31 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x

commit e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 15:22:48 2016 +0200

    - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email

commit f095dea
Merge: 7b09747 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 12:37:55 2016 +0200

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext

commit a15557e
Merge: 0daad70 ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Thu Oct 27 17:10:53 2016 +0200

    Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x

commit 0daad70
Merge: 927d18b 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:07:58 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:05:17 2016 +0200

    inserted a better explanation on how to use the chains

commit 927d18b
Merge: f8cbc63 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 19:00:44 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:57:48 2016 +0200

    - typo

commit f8cbc63
Merge: 9f42664 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:53:11 2016 +0200

    Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:50:35 2016 +0200

    - Implement what described in OrchardCMS#6688

    Supported Syntaxes for Request and Form tokens are:
    1. QueryString:(param1) or Form:(param1)
    2. QueryString:param1 or Form:param1
    3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken

    If you want to Chain TextTokens you have to use the 3rd syntax
    the element (here param1) has been surrounded with brackets in order to preserve backward compatibility.

commit ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Wed Oct 26 11:46:24 2016 +0200

    Fixes OrchardCMS#7346

commit 9f42664
Merge: 60aa1cc f6cfe32
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:57 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x

commit 60aa1cc
Merge: c1b1c4d 7a16cf5
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:28 2016 +0200

    Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x

commit c1b1c4d
Merge: bf2201c e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:19:54 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x

commit e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:18:24 2016 +0200

    - Formatted Code (Rebracer)

commit f6cfe32
Merge: 7a16cf5 bf2201c
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 24 09:24:57 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x
    Ho fatto pull della 1.10 remota di Orchard

commit bf2201c
Merge: 67af300 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 18:40:21 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

    # Conflicts:
    #	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs

commit 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 67af300
Merge: d4d4a32 a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:56:13 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:55:38 2016 +0200

    - missing Attachments Key fix

commit d4d4a32
Merge: 297e586 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:40 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 297e586
Merge: 54a1bdf 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:39:11 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:37:07 2016 +0200

    - Method renamed
    - try catch removed

commit 54a1bdf
Merge: b7ee130 794b9b0
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:51:29 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 794b9b0
Merge: 1dcee8a 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:44:35 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation

commit 1dcee8a
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - typo chaching > caching

    - added EventHandler in order to partecipate in cachekey generation

commit 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:40:58 2016 +0200

    - typo chaching > caching

commit b7ee130
Merge: c9e14f9 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:32:13 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - added EventHandler in order to partecipate in cachekey generation

commit c9e14f9
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 17 12:54:53 2016 +0200

    Modified the OutputCache Module based on the enhancement proposed in Issue 5811,
    by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies
sebastienros
sebastienros reviewed Nov 10, 2016
View reviewed changes
...rchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldLocalizationSettings.cshtml
</div>
</fieldset>

@using (Script.Foot()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look into the Users settings.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically the data-controllerid attribute

sebastienros
sebastienros reviewed Nov 10, 2016
View reviewed changes
...rchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldLocalizationSettings.cshtml
@Html.CheckBoxFor(m => m.TryToLocalizeItems)
<label for="@Html.FieldIdFor(m => m.TryToLocalizeItems)" class="forcheckbox">@T("Try to replace selected items with their correct localization.")</label>
<span class="hint">@T("Check to attempt to replace items selected in this field with their translation in the main ContentItem's culture. This only applies if the main ContentItem has a LocalizationPart.")</span>
<div id="@Html.FieldIdFor(m => m)_subOption1" style="display:none; padding-left:2em;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove any inline style. Or prove that it would be too ugly otherwise.

@sebastienros
Copy link
Member

We'll get a demo on tuesday.

@MatteoPiovanelli-Laser
Copy link
Contributor Author

@sebastienros
I pushed the changes to the view from your comments.

The data-controllerid attribute is nice to know.

Without the inline styles, the "sub-option" checkboxes are on the same level as the option they depend on. I think it's clearer to have the "sub-option" indented. I can insert &emsp; to get basically the same, but it feels kludgey to me.

We'll give this a look when we demo it next Tuesday.

@MatteoPiovanelli-Laser
Added culture information to the contentpickerfield editor view
eb9d256
@MatteoPiovanelli-Laser
Fixed a bug in the handler (!= instead of ==)
ab9eb4e
@MatteoPiovanelli-Laser
showing displaytext in warnings and notifications rather than content…
0673617 
… item's id
@MatteoPiovanelli-Laser
Cleanup. I
4287696 
ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly
@sebastienros sebastienros merged commit f697fbb into OrchardCMS:1.10.x Nov 17, 2016
@MatteoPiovanelli-Laser MatteoPiovanelli-Laser deleted the issue/7352_ContentPickerLocalizationUpgrades_ExtensionFeature branch February 8, 2017 14:00
toannguyen241994 added a commit to toannguyen241994/Orchard that referenced this pull request Feb 21, 2017
@toannguyen241994
update my fork repository (#1)
c81667a 
* Removed incorrect comments in Gulpfile.js.

* Fixing that with multiple TinyMCE editors on a page multiple toolbars also appeared, see OrchardCMS#7022

* Readme: Simplifying the "Project Status" section

* [Fixes OrchardCMS#7034] Don't cache pages when status code is changed in the view

* Fixed the output caching of non 200 responses when errors are thrown in views

* Added debug message to output cache when the response isn't cached due to a non 200 status code.

* [Fixes OrchardCMS#7003] Fixing NRE

* Fixing that the debug log was created even in Release mode

* Use ISO 8601 format for date times

Fixes OrchardCMS#6973

* Identity support to menu create command switch

* Admin, content list, fixed lowercase display and CSS class of bulk labels

* Fixing typos.

Fixes OrchardCMS#6902

* Sanitize username in activity

* fix typo of occured for logging messages and notification (OrchardCMS#7083)

* Allowing adding classes through ShapeTableBuilder.Describe

Small change to Content.Summary.cshtml to allow module developers to add classes to Content.Summary.cshtml via ShapeTableBuilder.Describe.

Fixes OrchardCMS#7089

* Pass the right display type to the widget element. (OrchardCMS#7074)

* [Fixes OrchardCMS#6812] Add shape attributes to "CreateElementTagBuilder"

* [Fixes OrchardCMS#7043] Displaying Multiple Editors from a Custom Part

* [Fixes OrchardCMS#7104] - Widget Element Title Encoding Fix

* [Fixes OrchardCMS#7119] Path Comparison Case Sensitivity

* [Fixes OrchardCMS#7121] Fix incorrect documentation url

* Preserve returnUrl value in Content-User.Edit.cshtml

Fixes OrchardCMS#7141 OrchardCMS#3447

* Labels hidden when datetime field added (OrchardCMS#7146)

Fixes OrchardCMS#7144

* Labels hidden when datetime field added (OrchardCMS#7146)

Fixes OrchardCMS#7144

* Fix incorrect title on edit page

Fixes OrchardCMS#7142

* Fix incorrect title on edit page

Fixes OrchardCMS#7142

* [Fixes OrchardCMS#7129] Boolean.cshtml doesn't have * required support in view (OrchardCMS#7133)

* [Fixes OrchardCMS#7125] tokenized css class left behind (OrchardCMS#7127)

* Allow custom date format when displaying published state

Wen overriding the Parts.Common.Metadata.cshtml in a theme, this will allow for changing the date format used to display the date.

* [Fixes OrchardCMS#7132] Orchard.Fields - Inconsistent use of mandatory / required (OrchardCMS#7134)

* [Fixes OrchardCMS#5708] Orchard.Fields - Inconsistent use of mandatory / required

* finish off updating messages + tests

* fix broken test

* Fixed ContentFieldHarvester when NULL Content

The content field harvester throws an error when the LayoutEditor is rendered without having a content item as the context (BluePrints, for example). The previous code would fall back to simply enumerating all fields of all parts to make available all content fields as elements. However, the content field elements can't render these fields without having a proper content item as context, so it would fail with an exception.

There are scenarios where one might still want to be able to add content field elements on the canvas even when there is no current content item (to create template layouts for example). But to support this, we need to figure out what we want to render if we can;t actually render the content field at design time. Perhaps a simplified representation would suffice in this scenario. To be discussed. Removing the broken feature for now.

* [Fixes OrchardCMS#7153] Typo .buton:active in several css files (OrchardCMS#7154)

* [Fixes OrchardCMS#7153] Typo .buton:active in several css files

[Fixes OrchardCMS#7153] Typo .buton:active in several css files

* [Fixes OrchardCMS#7153] Typo .buton:active in several css files

[Fixes OrchardCMS#7153] Typo .buton:active in several css files

* [Fixes OrchardCMS#7153] Typo .buton:active in several css files

[Fixes OrchardCMS#7153] Typo .buton:active in several css files

* [Fixes OrchardCMS#7153] Typo .buton:active in several css files

[Fixes OrchardCMS#7153] Typo .buton:active in several css files

* Added CodeRush for Roslyn settings folder to .gitignore.

* [Fixes OrchardCMS#7151] Orchard.Core - Use CDN setting ui not correct (OrchardCMS#7152)

[Fixes OrchardCMS#7151] Orchard.Core - Use CDN setting ui not correct

* Fields display as "&amp;" instead of "&" in validation error msgs (OrchardCMS#7156)

Fixes OrchardCMS#7111

* Wrapped owin middleware config (OrchardCMS#7161)

This wraps owin middle ware configuration within a work context scope.

Fixes OrchardCMS#6991

* Fixes OrchardCMS#7120 Hidden Field in Dynamic Forms causes crash (OrchardCMS#7123)

Fixes OrchardCMS#7120 - If a Hidden Field is added to a DynamicForm without a Value set then it will crash the front end because of a null value.

* Customize blog recipe (OrchardCMS#7166)

Fixes OrchardCMS#7115

* [Fixes OrchardCMS#7131] Orchard.ContentTypes - Add / Edit Field Issues (OrchardCMS#7150)

* [Fixes OrchardCMS#7192] Orchard.Tags - Manage Tags Admin Page Not Alpha Sorted (OrchardCMS#7198)

* line wrap css and bind title attr

Fixes OrchardCMS#7208

* Add Orchard.Tags.TagsCloud "no data" message

Fixes OrchardCMS#7170

* Orchard.Blogs - Hide Parts_Common_Metadata on blog

Fixes OrchardCMS#7171

* [Fixes 7246] Added null checks for version ids

Fixes OrchardCMS#7246

* feature - add front end toggling of shape tracing

Fixes OrchardCMS#7162

* Blog Recent Posts, Archives, Tag Cloud "no data" msgs

Fixes OrchardCMS#7168, Fixes OrchardCMS#7169, Fixes OrchardCMS#7170

* Fixed an issue with incorrect log message at Indexing module

* Fixed incorrect log message in Indexing module
* Fixed an issue with incorrect log message at Indexing module
* Fixed identation

Fixes OrchardCMS#7225

* Orchard.MultiTenancy - Mismatched ConnectionString UI between add/edit

Fixes OrchardCMS#7301

* [Fixes OrchardCMS#4723] Orchard.Core.Contents - Verify type exists on create content

Fixes OrchardCMS#4723, OrchardCMS#6769

* Fixed an issue with layout element lookup. (OrchardCMS#7305)

Fixes OrchardCMS#7304

* [Fixes OrchardCMS#6704] Regular Expression for Validating TextField Element (OrchardCMS#6705)

Fixes OrchardCMS#6704

* [Fixes OrchardCMS#5960] LinkEntry needs Sizes Attribute (OrchardCMS#7303)

Fixes OrchardCMS#5960

* [Fixes OrchardCMS#6494] SSL missing settings banner showing on frontend (OrchardCMS#7302)

Fixes OrchardCMS#6494

* [Fixes OrchardCMS#7294] Orchard.Core - Improve wording of Notifier in Content Management admin (OrchardCMS#7298)

Fixes OrchardCMS#7294

* [Fixes OrchardCMS#7299] Update defaults for rebracer.xml (OrchardCMS#7300)

Fixes OrchardCMS#7299

* [Fixes OrchardCMS#7255] Cached items are not evicted on Remove and Destroy (OrchardCMS#7281)

Fixes OrchardCMS#7255

* [Fixes 6759] Replace Media Item: Replacing an Image/OEmbed with new one (OrchardCMS#7160)

Fixes OrchardCMS#6759

* [Fixes OrchardCMS#7155] Orchard.Framework - GroupInfo generates routes with spaces (OrchardCMS#7275)

Fixes OrchardCMS#7155

* [Fixes OrchardCMS#7318] Orchard.DesignerTools - Setting Id not needed anymore (OrchardCMS#7319)

Fixes OrchardCMS#7318

* Fixing SQL exception during automatic migrations in PostgreSql

Fixes OrchardCMS#6783
Fixes OrchardCMS#7323

* [Fixes OrchardCMS#5811] Adding a VaryByRequestCookies property to the CacheSettingsPart

Fixes OrchardCMS#5811

* [Fixes OrchardCMS#7326] Orchard.Widgets - Fix typo in logger (OrchardCMS#7327)

* [Fixes OrchardCMS#7071] Orchard.Users - Users last login time is not correct (OrchardCMS#7325)

Fixes OrchardCMS#7071

* [Fixes OrchardCMS#7251, Fixes OrchardCMS#1659] Orchard.Setup - Blog recipe doesn't create widgets correctly (OrchardCMS#7324)

Fixes OrchardCMS#7251, Fixes OrchardCMS#1659

* [Fixes OrchardCMS#7258] Orchard.Core - Tabbed groupby breaks priority (OrchardCMS#7321)

Fixes OrchardCMS#7258

* Orchard.Roles GetRoles should defer execution (OrchardCMS#7320)

Fixes OrchardCMS#7278

* [Fixes OrchardCMS#7258] Orchard.Core - Tabbed groupby breaks priority (OrchardCMS#7336)

Fixes OrchardCMS#7258

* Fixed wording of "vary by cookies" option in admin UI.

* Adding missing import/export for UserPart.LastPasswordChangeUtc

* Fixing that for existing users LastPasswordChangeUtc being null caused errors

* Fixing that DateTime.MinValue as default value for LastPasswordChangeUtc causes exception during setup

* [Fixes OrchardCMS#7339] Orchard.Widgets - Refactor OrchardCMS#7251 (OrchardCMS#7342)

Fixes OrchardCMS#7339

* [Fixes OrchardCMS#7346] Allowing cultures and layers to be selected in Widgets

Fixes OrchardCMS#7346

* Update Module.txt (OrchardCMS#6945)

* [Feature OrchardCMS#5790] Adding cache key generation extensibility (OrchardCMS#7334)

* Allow the initial value of some fields to be tokenized (OrchardCMS#6613)

Fixes OrchardCMS#6613 
Fixes OrchardCMS#6237

* Fix Event Bus for null exception (OrchardCMS#7360)

EventsInterceptor fails when it tries to locate a generic method on an implementation with a return type. A null check has been added to avoid the exception.

Fixes OrchardCMS#4718 
Dixes OrchardCMS#4584

* Adding the ability to select whether a Template (content item) will be rendered on the frontend, admin, or both. Fixes OrchardCMS#5579.

* Adding import/export for the RenderingMode property of ShapePart

* Changed Audit Trail trimming task to delete all records in one batch, rather than iterating through the table records (OrchardCMS#7361)

* LocalizationStreamParser should not fail on faulty PO files

Closes OrchardCMS#7387

* Using Invoke helper in Clone() (OrchardCMS#7400)

* Delete scheduled task when content is published

Fixes OrchardCMS#6840

* Sort Taxonomies Terms failed

Fixes OrchardCMS#6795

* Implements ContentPicker localization options discussed in OrchardCMS#7352 (OrchardCMS#7391)

* Squashed commit of the following:

commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46
Author: matteo.piovanelli <[email protected]>
Date:   Thu Nov 10 12:02:09 2016 +0100

    Added notifications about what the localization methods for ContentPickerField will do or have done.

commit 04eb7074dcfef2c8beb65f0322821dc654902cfb
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 17:48:59 2016 +0100

    Added the TryTranslate option and its suboptions

commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 15:31:44 2016 +0100

    Added a new feature to the ContentPicker module.
    So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture

commit b90629d
Merge: 578b21b c486355
Author: matteo.piovanelli <[email protected]>
Date:   Tue Nov 8 09:37:30 2016 +0100

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x

commit 578b21b
Merge: 395976f 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:45:51 2016 +0100

    Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x

commit 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:43:38 2016 +0100

    - replaced Regex.Replace with String.Trim(char[]) as suggested
    - ran Orchard.Tokens.Tests: 66/66 passed

commit 395976f
Merge: 708ed79 a15557e
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:34:50 2016 +0200

    Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 708ed79
Merge: 5fe0b69 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:52 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 5fe0b69
Merge: 0daad70 e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:31 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x

commit e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 15:22:48 2016 +0200

    - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email

commit f095dea
Merge: 7b09747 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 12:37:55 2016 +0200

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext

commit a15557e
Merge: 0daad70 ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Thu Oct 27 17:10:53 2016 +0200

    Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x

commit 0daad70
Merge: 927d18b 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:07:58 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:05:17 2016 +0200

    inserted a better explanation on how to use the chains

commit 927d18b
Merge: f8cbc63 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 19:00:44 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:57:48 2016 +0200

    - typo

commit f8cbc63
Merge: 9f42664 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:53:11 2016 +0200

    Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:50:35 2016 +0200

    - Implement what described in OrchardCMS#6688

    Supported Syntaxes for Request and Form tokens are:
    1. QueryString:(param1) or Form:(param1)
    2. QueryString:param1 or Form:param1
    3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken

    If you want to Chain TextTokens you have to use the 3rd syntax
    the element (here param1) has been surrounded with brackets in order to preserve backward compatibility.

commit ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Wed Oct 26 11:46:24 2016 +0200

    Fixes OrchardCMS#7346

commit 9f42664
Merge: 60aa1cc f6cfe32
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:57 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x

commit 60aa1cc
Merge: c1b1c4d 7a16cf5
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:28 2016 +0200

    Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x

commit c1b1c4d
Merge: bf2201c e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:19:54 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x

commit e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:18:24 2016 +0200

    - Formatted Code (Rebracer)

commit f6cfe32
Merge: 7a16cf5 bf2201c
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 24 09:24:57 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x
    Ho fatto pull della 1.10 remota di Orchard

commit bf2201c
Merge: 67af300 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 18:40:21 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

    # Conflicts:
    #	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs

commit 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 67af300
Merge: d4d4a32 a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:56:13 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:55:38 2016 +0200

    - missing Attachments Key fix

commit d4d4a32
Merge: 297e586 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:40 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 297e586
Merge: 54a1bdf 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:39:11 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:37:07 2016 +0200

    - Method renamed
    - try catch removed

commit 54a1bdf
Merge: b7ee130 794b9b0
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:51:29 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 794b9b0
Merge: 1dcee8a 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:44:35 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation

commit 1dcee8a
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - typo chaching > caching

    - added EventHandler in order to partecipate in cachekey generation

commit 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:40:58 2016 +0200

    - typo chaching > caching

commit b7ee130
Merge: c9e14f9 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:32:13 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - added EventHandler in order to partecipate in cachekey generation

commit c9e14f9
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 17 12:54:53 2016 +0200

    Modified the OutputCache Module based on the enhancement proposed in Issue 5811,
    by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies

* Changed the view as reccomended by @sebastienros in his comments

* Added culture information to the contentpickerfield editor view

* Fixed a bug in the handler (!= instead of ==)

* showing displaytext in warnings and notifications rather than content item's id

* Cleanup. I
ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly

* Content picker localization culture dropdown (OrchardCMS#7388)

* Default Tag Cache from HttpContext (OrchardCMS#7280)

Fixes OrchardCMS#7240

* Bug reading SiteSettings from the Routes class (OrchardCMS#7363)

Fixes OrchardCMS#7362

* Implements what described in OrchardCMS#6688 (OrchardCMS#7356)

Fixes OrchardCMS#6688

* [Fixes OrchardCMS#7378] Fixed tenant name validation regex, not to allow numbers. (OrchardCMS#7399)

[Fixes OrchardCMS#7378]

* Fix link to dotnetfoundation (OrchardCMS#7434)

* Fixed the tenant name validation (OrchardCMS#7429)

* Fix DateTime parsed in ISO 8601 format. (OrchardCMS#7433)

Fixes OrchardCMS#7432

* Rename ModelStateDistionaryExtensions.cs to ModelStateDictionaryExtensions.cs (OrchardCMS#7415)

* Rename ModelStateDistionaryExtensions.cs to ModelStateDictionaryExtensions.cs

Fixed spelling in file name

* Update Orchard.Users.csproj

Fixed misspelling.

* Adding the ability to enable HTTP Strict Transport Security from the SSL module, fixes OrchardCMS#6612

* [Fixes OrchardCMS#7436] Added a using of System.Linq in CSharp scripting. (OrchardCMS#7437)

Fixes OrchardCMS#7436

* [Fixes OrchardCMS#7443] Jobs Queue menu item visibility for site owners only. (OrchardCMS#7444)

Fixes OrchardCMS#7443

* [Fixes OrchardCMS#7446] Orchard.Users - Allow umlauts in UserPart.EmailPattern  (OrchardCMS#7447)

Fixes OrchardCMS#7446

* ProjectionManager Extension (OrchardCMS#7417)

- Defined a new interface IProjectionManagerExtension that inherits from IProjectionManager
- ProjectionManager now implements IProjectionManagerExtension, so we can pass a part to GetCount and GetContentItems
- GetCount and GetContentItems transform the part into a Content token, so you can filter data with informations contained in the Projection itself

* [Fixes OrchardCMS#7441] Adapt export steps flag to work with refactored steps (OrchardCMS#7442)

Fixes OrchardCMS#7441

* [Fixes OrchardCMS#6196] Added attachments logic (OrchardCMS#7338)

Fixes OrchardCMS#6196

* [Fixes OrchardCMS#7404] Users own media folder name provider (OrchardCMS#7454)

Fixes OrchardCMS#7404

* [Fixes #OrchardCMS#7430] Added support for culture neutral patterns (OrchardCMS#7449)

Fixes #OrchardCMS#7430

* Adding ability to remove draft and adding grouping to SummaryAdmin content menu, see OrchardCMS#2661 and OrchardCMS#2662

These two issues are tightly connected so better to address them at once.

* [Fixes OrchardCMS#7427] Fixing Blog Post permission

The SummaryAdmin was not using the dedicated permissions.
The default content handler can convert to the owner variation before the blogpost handler.

Fixes OrchardCMS#7427

* [Fixes: OrchardCMS#7462] Orchard.OutputCache - Possible NRE in DefaultTagCache ctor when accessing the WorkContext (OrchardCMS#7463)

Fixes OrchardCMS#7462

* [Fixes OrchardCMS#7467] Changed gulpfile to invoke autoprefixer directly instead of through cssnano. (OrchardCMS#7470)

Fixes OrchardCMS#7467

* [Fixes OrchardCMS#4941] Adds Url property to dynamic menu shape (OrchardCMS#7468)

Fixes OrchardCMS#4941

* [Fixes OrchardCMS#7425] Session Locator | Isolation Levels not respected in Sites.config (OrchardCMS#7466)

Fixes OrchardCMS#7425

* [Fixes OrchardCMS#7425] Session Locator | Isolation Levels not respected in Sites.config (OrchardCMS#7466)

Fixes OrchardCMS#7425

* [Fixes OrchardCMS#7451] Encoding of taxonomies in the dynamic forms (OrchardCMS#7458)

Fixes OrchardCMS#7451

* [Fixes OrchardCMS#7413] Refactor taxonomies and terms permissions  (OrchardCMS#7456)

Fixes OrchardCMS#7413 

* Taxonomies:
 - AdminController: Added Actions to AdminController in order to manage Create/Edit: Only Users with Permission.CreateTaxonomy can Edit/Create a Taxonomy
 - Views/Admin/Index.cshtml: Conditional display of ActionLink Create/Edit in Admin/Index.cshtml based on Permission.CreateTaxonomy
 - Views/Admin/Index.cshtml: Conditional display of ActionLink Delete in Admin/Index.cshtml based on Permission.ManageTaxonomies
 - TaxonomyPartHandler: Adding context.Metadata.EditorRouteValues for Taxonomy
Terms:
 - Paring Action/Permission based on existing Permissions
 - Views/TermAdmin/Index.cshtml: Conditional display of ActionLink Create/Edit/Move/Delete based on right Permissions
 - TermPartHandler: Adding context.Metadata.EditorRouteValues for Taxonomy
AdminMenu:
 - The AdminMenu was shown only if a User had ManageTaxonomies Permission; In that way, Roles who have the Create/Edit/Delete Term Permission could not access Index/Edit forms: specializing permissions on Navigation grants access to users belonging to those Roles.

* Removed redundant check over SiteOwner permission

* [OrchardCMS#7396] Implements UnassignRoleActivity (OrchardCMS#7414)

Fixes OrchardCMS#7396

* [Fixes OrchardCMS#7469] Fix tenant restart infinite loop. (OrchardCMS#7471)

Fixes OrchardCMS#7469

* Extensions are not enabled any more if they can't actually be loaded, fixes OrchardCMS#2437

* [Fixes 6890] Admin Menu: fix for "Content" item visibility. (OrchardCMS#7464)

Fixes OrchardCMS#6890

* Usage of undeclared variables in Link.Edit.cshtml. (OrchardCMS#7473)

* Update WidgetCommandsService.cs (OrchardCMS#7477)

Removed hard coded override of the RenderTitle property for Menu Widgets.

* [Fixes 7474] Add Canvas in Page commands (OrchardCMS#7475)

Fixes OrchardCMS#7474.
Create layout with a Canvas root element so it can be edited in the Orchard admin.

* [Fixes 7472] Fix for mp4 file not streaming from Azure blob (OrchardCMS#7465)

Fixes 7474 

By default Azure blob storage uses service version "2009-09-19". mp4 files served with this version have to be fully downloaded to play.
More info can be found here http://blog.thoughtstuff.co.uk/2014/01/streaming-mp4-video-files-in-azure-storage-containers-blob-storage/.

* Adds IDecorator functionality (OrchardCMS#6233)

* [Fixes OrchardCMS#7452] Media Library: Replacing a media item in recent section (OrchardCMS#7484)

Fixes OrchardCMS#7452

* Orchard.Comments - Rework frontend and fix bugs (OrchardCMS#7332)

[Fixes OrchardCMS#7212, Fixes OrchardCMS#7329]

* Fixing that JobsQueue will fail if there are a large number of tasks, fixes OrchardCMS#5365

JobsQueue now works in batches to prevent transaction timeouts and the manual job execution feature uses batches as well. This is a fix for the immediate issue, further fixes are needed around the background task infrastructure, see the linked issue.

* [Fixes OrchardCMS#1531] IThemeSelector.GetTheme() gets called several times. (OrchardCMS#7491)

Fixes OrchardCMS#1531

* Fixing QueryHints.Empty mutable usage

Fixes OrchardCMS#7358

* Fixing settings group info matching

Fixes OrchardCMS#7371

* Adding vsvars32.bat is vsvarall cannot be found

* Fixing unit test

* Fixing membership unit tests

* Improved performance of Count Hql queries (OrchardCMS#7501)

* Feature/openid (OrchardCMS#7420)

* [Fixes OrchardCMS#6316] Update Alias when importing AutoroutePart (OrchardCMS#7485)

Fixes OrchardCMS#6316

* Make each JobsQueue tasks execute in its own transaction, see OrchardCMS#5365

* Add UserParameters token object (OrchardCMS#7482)

Fixes OrchardCMS#7481

* Fixing that the content fields' values in a new content item were reset when building their editor (OrchardCMS#7505) (OrchardCMS#7507)

Fixes OrchardCMS#7505

* Hide Gallery menu items on other tenants than Default. (OrchardCMS#7511)

* Fixing Gallery search

Fixes OrchardCMS#7497

* Output cache vary by query string modes (OrchardCMS#7509)

* Fixed path to .vs folder in .gitignore.

* Updated Gulp package dependencies (except TypeScript).

* Updated Gulp pipeline to use latest version of TypeScript.

This also required a change to flow all .js source files through the TypeScript transpiler and let TypeScript do the concatenation/bundling where applicable. This has the added bonus of catching more errors in plain .js files as the TypeScript compiler applies its structural and semantic understanding of the JavaScript code.

* Fixed redundant double negation in Gulpfile.js.

* Added ability to override TypeScript options from asset manifest.

* Added Gulp asset manifest change detection for non-bundled asset groups.

When running the 'build' task, a non-bundled asset group will now be rebuilt if the asset manifest file itself is newer than any of the output files.

* [Fixes OrchardCMS#7515] Add RemoveContentDefinition recipe step (OrchardCMS#7516)

* Changed .gitignore to exclude node_modules on all levels.

* Added two new features to Gulpfile.js (see below).

- Added support for separating minified resources by folder instead of by .min suffix.
- Added support for flattening the output directory structure of glob-based asset groups.
- Fixed bug where non-minified .js output files were not EOL normalized.

* Fix the error that was preventing the load of the settings' views of the OpenId features (OrchardCMS#7518)

* [Fixes OrchardCMS#7348] Changed the SummaryAdmin view to have the same "New Translation" link as the Editor view (OrchardCMS#7513)

Fixes OrchardCMS#7348

* Glimpse (OrchardCMS#7502)

Fixes OrchardCMS#5419

* Removed duplicated line in AutomaticDataMigrations.cs (OrchardCMS#7522)

Fixes OrchardCMS#7521

* Fixing that SpecFlow tests were not ran using the tools from the NUnit NuGet package

* Layouts: Removing incompatible (C# 6) code

* Framework: Removing unused file (ContentManagement\Handlers\IdentifyDependenciesContext.cs)

* Core: Removing empty folders

* Users: Removing unnecessary file copied to the Users module (see UserResolverSelector.cs)

Same change as 5e17db3

* Redis: Improving Redis extensions use of keys (OrchardCMS#7532) (OrchardCMS#5958 re-applied)

* Framework: Fixing that a non-zero MaxPageSize site setting was not applied when the page size is 0, OrchardCMS#7541

* Avoid deleting terms twice just getting the root terms on DeleteTaxonomy method (OrchardCMS#7553)

* [Fixes OrchardCMS#7479] Unwrapping of TargetInvocationException causes partial stacktrace loss (OrchardCMS#7550)

Fixes OrchardCMS#7479

* [Fixes OrchardCMS#5596] blueprint harvesting caching (OrchardCMS#7549)

Fixes OrchardCMS#5596

* [Fixes OrchardCMS#7486] Possibility of exporting individual Form Submissions (OrchardCMS#7495)

* Flushing tasks deletion (OrchardCMS#7547)

* Adding feature dependencies to OpenId module (OrchardCMS#7526)

* Fixing redirect on tenants with a URL prefix, fixes OrchardCMS#4605

* MediaLibrary: Fixing that removing TitlePart from a type with MediaPart causes the type to be unusable due to an implicit dependency, fixes OrchardCMS#6047

* Remove long obsoleted IRouteProvider.GetRoutes(), see OrchardCMS#3177

* Automatically adding MediaPart to content types if another part depends on it, fixes OrchardCMS#4792

* Fixes OrchardCMS#7493 TextFieldDriver doesn't export its tag if content is empty (OrchardCMS#7510)

* TextFieldDriver doesn't export its tag if content is empty
* Null check implemented , string.Empty returned
* TextFieldDriver doesn't export its tag if content is empty OrchardCMS#7493
* TextFieldDriver doesn't export its tag if content is empty OrchardCMS#7493

* Added missing project dependency for Orchard.Glimps.

* Recipe description didn't match selected one (OrchardCMS#7559)

* Feature to remove a Publish Later task (OrchardCMS#7438)

* Added missing SnippetDescriptor property to Snippet element shape.

* Fix validation property name on SiteName (OrchardCMS#7567)

Fixes OrchardCMS#7565

* Revert "Improved performance of Count Hql queries" (OrchardCMS#7563)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebastienros sebastienros sebastienros left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MatteoPiovanelli-Laser @sebastienros @dnfclas