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.

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

Exclude resource alias for child #13660

Merged
merged 16 commits into from
Jan 29, 2018

Conversation

labr1005
Copy link
Contributor

@labr1005 labr1005 commented Oct 30, 2017

What does it do?

This includes and extends the PR #13395 by @OptimusCrime.

What does it do?

Implement functionality to hide a alias in the path of children resources.

Includes:

This PR makes sure to add the new field in the map files of both MSSQL and MySQL. I've also added scripts for each of them to be added during an upgrade. This is test and works as expected.
Adds a new checkbox under Settings in the box at the right side, below Searchable and above Freeze URI.
Adds a simple lexicon entry with a wording similar to that in Evo. Appears when hoving the checkbox like the other settings in this area.
It works like this. Say we have the current relationship of resources Foo -> Bar, which has aliases foo and Bar which has its alias to bar. The default value of alias_visible is 1, so it does not change the current behavior of any sites without alterations. If both Foo and Bar has this setting to 1 (as is the default), it would produce the URI as before foo/ and foo/bar. Below are the other configurations and their URI values:

Foo alias_visible = 0. Bar alias_visible = 1
Foo URI = foo/. Bar URI = bar.

Foo alias_visible = 1. Bar alias_visible = 0
Foo URI = foo/. Bar URI = foo/bar.

Foo alias_visible = 0. Bar alias_visible = 0
Foo URI = foo/. Bar URI = bar.

As we see, the URIs ignore the PARENT alias if alias_visible is 0, but will always use its own alias regardless of the alias_visible value. This is because we always require an alias for any resource.

Note: This PR is currently missing tests. I'd love to implement some tests to make sure this works like it should.

Why is it needed?

Could be useful in certain situations. See issue referenced below. Seem like a common request. The feature was present in Evo, but for some reason removed since then. I see no reason this should not be included in the core. The functionality to go around this via an extra/plugin would be rather painful to implement.

Related issue(s)/PR(s)

#11153
#13395

@OptimusCrime
Copy link
Contributor

Nice. This is fine by me. I was waiting to include some unit tests in my PR. I did not find the time to include this. However, I am working on simplifying and improving the test suit, which in turn will make it easier to include proper tests for this. If someone can test the functionality and validate that it works, then I think that should be good enough for now.

@Bruno17
Copy link
Contributor

Bruno17 commented Oct 31, 2017

Anyone knows when and where this file
setup/includes/upgrades/mysql/2.6.0-pl.php
is called in the setup - process?

I've added this upgrades-files and was trying to rerun the setup of 2.6.0-dev
Seems this script doesn't run in this situation.

@OptimusCrime
Copy link
Contributor

Most likely because the Git version is not tagged with the correct release version. I did not investigate just how this process is executed, but it is a part of the setup process.

@labr1005
Copy link
Contributor Author

labr1005 commented Nov 1, 2017

Hm, worked for me without any problems. Took the 2.x branch and ran setup. Switched to the feature branch and reran setup.

Successfully upgraded table for class modResource
Added new alias_visible column to modx_site_content.

Edit: Upgrading from 2.5.8 also worked for me.

@OptimusCrime
Copy link
Contributor

Closed my original PR #13395 in favor of this. Note that my original PR contains some questions and answers concerning the implementation. Check this first you have any questions.

@labr1005 labr1005 changed the title [EXTENSION] Exclude resource alias for child Exclude resource alias for child Nov 1, 2017
@Jako Jako added area-core proposal Proposal about improvement aka RFC. Need to be discussed before start implementation. priority-2-high labels Nov 2, 2017
@weranda
Copy link

weranda commented Dec 6, 2017

Hi, guys.
Maybe you know.
Will be included this changes in the new version MODX (2.6.x)? Are there any chances?
I don't understand what's going on here)

@rthrash rthrash added this to the v2.7.0 milestone Dec 11, 2017
@Mark-H
Copy link
Collaborator

Mark-H commented Jan 29, 2018

For future reference (not sure if this was you @labr1005 or @OptimusCrime) - there's no need to change all the lexicon files. CrowdIn will add the changes to those automatically.

@Mark-H Mark-H self-assigned this Jan 29, 2018
@Mark-H Mark-H merged commit 4802026 into modxcms:2.x Jan 29, 2018
Mark-H added a commit that referenced this pull request Jan 29, 2018
… resources from the URI [#11153, #13660]

Merge remote-tracking branch 'upstream/pr/13660' into 2.x

* upstream/pr/13660:
  Update translation (taken from evo)
  Fix alias_visible checkbox in quick create/update window
  Fix typo
  Add alias_visible checkbox to quick update resource form
  Refresh children URIs on save/update when alias_visible is marked as dirty
  Implement logic for hiding parent alias fragments
  Restate resource modext changes
  Undo accidental changes to modResource
  Set default checkbox value to checked
  Add english lexicon entries
  Move checkbox to the left side and add help text + label
  Add alias_visible checkbox to resource form
  Add upgrade script for new column field
  Add property to modResource class
  Add alias_visible to map files
@Mark-H
Copy link
Collaborator

Mark-H commented Jan 29, 2018

It may have taken close to 4 years since Bert's original request in #11153, but at last this has been incorporated 😬

@Bruno17 Perhaps you were already on 2.6.0 (or higher) causing the upgrades to not run. It looks at the stored version number (settings_version system setting) and the name of the file in the database-driver-specific directory. I've updated the files to 2.7.0 to get them to run in my testing as well.

Mark-H added a commit to Mark-H/revolution that referenced this pull request Feb 16, 2018
…nze van der Brug, implemented by Christian Seel and Mark Hamstra

Squashed commit of the following:

commit 15c713c
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Feb 12 13:23:39 2018 +0100

    Automatically reload the page after changing the language

commit 2f700ab
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Feb 12 13:23:04 2018 +0100

    Make sure language selector automatically falls back on different languages

commit aaa2044
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Feb 12 13:22:02 2018 +0100

    Add setting to control if the help button shows up, defaulting to off

commit 7f4e027
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 22:18:33 2018 +0100

    remove debug tpl

commit d57ccb9
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 21:26:40 2018 +0100

    log in

commit 9c86646
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 21:15:47 2018 +0100

    include lifetime to rememberme string

commit 6b74f05
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 18:56:00 2018 +0100

    It’s a Manager

commit 5e347ce
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 18:12:46 2018 +0100

    improve wording on login screen

commit c4e69b3
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 18:00:38 2018 +0100

    make language switch response and use native language strings instead of lang codes

commit e1dbac0
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 16:43:27 2018 +0100

    no more uppercase language codes

commit 97e6eec
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 16:39:36 2018 +0100

    add help and language switch

commit be18c99
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 15:52:54 2018 +0100

    refactor css classes to BEM

commit a067f33
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 14:06:16 2018 +0100

    responsive optimizations

commit 72cc9f1
Author: Christian Seel <cs@seda.digital>
Date:   Sat Feb 10 13:21:12 2018 +0100

    set line-height for paragraphs

commit 0c29288
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Sat Feb 10 01:37:06 2018 +0100

    Remove extjs dependencies, and move the only required script into the footer

commit cbd6e87
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Sat Feb 10 01:09:21 2018 +0100

    Add missing lexicon and restore former IDs in the form

commit 1f05dd8
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Sat Feb 10 00:55:31 2018 +0100

    Automatically focus on the username field in the new form when toggling

commit e1acaca
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Sat Feb 10 00:55:08 2018 +0100

    Hide hidden elements from screenreaders/keyboard navigation for improved accessibility

commit e27c8e2
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Sat Feb 10 00:47:25 2018 +0100

    Cleanup unused CSS/JS, remove dependency on ExtJS even more

commit 878e35f
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:47:18 2018 +0100

    Add lexicons for the help button

commit 82b1ad6
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:36:52 2018 +0100

    typo

commit d6e14b9
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:35:32 2018 +0100

    bring back marks placeholders

commit 30dfce2
Merge: 645bd51 8813386
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:34:45 2018 +0100

    Merge branch 'new-login-screen' of https://github.com/Mark-H/revolution into new-login-screen

    # Conflicts:
    #	manager/templates/default/security/login.tpl

commit 645bd51
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:34:04 2018 +0100

    added help link

commit 8813386
Merge: 50b2f94 81df10f
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:27:29 2018 +0100

    Merge branch 'new-login-screen' of github.com:Mark-H/revolution into new-login-screen

commit 50b2f94
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:27:22 2018 +0100

    Add login_background_image and login_logo settings to change what's shown in the manager login without needing a custom theme

commit 81df10f
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:18:07 2018 +0100

    increase max-height for toggle

commit 70d5f4f
Merge: 480c59c 597f0a3
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:16:11 2018 +0100

    Merge branch 'new-login-screen' of https://github.com/Mark-H/revolution into new-login-screen

commit 480c59c
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 23:15:59 2018 +0100

    stuff - best commit message ever

commit 597f0a3
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:13:33 2018 +0100

    Make sure captcha works

commit 7b3a109
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:06:07 2018 +0100

    Add missing hidden fields

commit 8dee013
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 23:01:37 2018 +0100

    Make sure forms show errors

commit dcd9880
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:53:23 2018 +0100

    optimize

commit 7086fd1
Merge: 692cc70 1c5e700
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:51:17 2018 +0100

    Merge branch 'new-login-screen' of https://github.com/Mark-H/revolution into new-login-screen

commit 1c5e700
Merge: d0d0f57 8e075be
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 22:51:01 2018 +0100

    Merge remote-tracking branch 'origin/new-login-screen' into new-login-screen

commit 692cc70
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:50:44 2018 +0100

    optimize outline

commit d0d0f57
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 22:49:52 2018 +0100

    Refactor extjs into vanillajs

commit 8e075be
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:45:27 2018 +0100

    bugfix form margin

commit ba45caa
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:44:00 2018 +0100

    optimize

commit 79233dc
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:39:56 2018 +0100

    can-toggle

commit bbec2bf
Merge: 81f22fc c9bae60
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 22:33:01 2018 +0100

    Merge branch 'new-login-screen' of github.com:Mark-H/revolution into new-login-screen

commit 81f22fc
Merge: c13cc00 0dbceba
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 22:32:47 2018 +0100

    Merge branch 'new-login-screen' of github.com:Mark-H/revolution into new-login-screen

commit c9bae60
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:30:43 2018 +0100

    basic toggle transition

commit c13cc00
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 22:30:27 2018 +0100

    Work on showing/hiding stuff properly

commit 0dbceba
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:21:04 2018 +0100

    make this thing a button

commit a0ff1fb
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:10:05 2018 +0100

    wip on forgot login

commit 9fb3969
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 22:00:06 2018 +0100

    wip login screen

commit 6dd8517
Merge: e127afe 124fec0
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 21:46:46 2018 +0100

    Merge branch 'new-login-screen' of https://github.com/Mark-H/revolution into new-login-screen

    # Conflicts:
    #	manager/templates/default/security/login.tpl

commit e127afe
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 21:45:18 2018 +0100

    wip login screen

commit 124fec0
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 21:44:11 2018 +0100

    Use lexicon for the welcome note as well

commit b7e4018
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 21:42:59 2018 +0100

    Make greeting dynamic based on server time + offset

commit 5db3188
Author: Christian Seel <cs@seda.digital>
Date:   Fri Feb 9 21:31:08 2018 +0100

    wip login frontend

commit 83e18f6
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 20:37:53 2018 +0100

    Add manager url to section js

commit 8b2a1d2
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Fri Feb 9 20:34:40 2018 +0100

    Strip down login.tpl and make it html5

commit b63c1cd
Merge: 6ce563b 2214b32
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Tue Jan 30 00:27:03 2018 +0100

    Add list of recent manager log entries to the Resource Overview page [modxcms#13734]

    Merge remote-tracking branch 'upstream/pr/13734' into 2.x

    * upstream/pr/13734:
      Modify getList processor to allow comma separated classKeys, and updating Changes tab action grid to request based on assigned class key as well as modResource
      Add Manager Log Grid to Resource Data
      Tabbing error on line 112
      Adding manager log to the resource changes tab

commit 6ce563b
Merge: 7cdc6e9 a3b4356
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Tue Jan 30 00:22:34 2018 +0100

    Ignore spaces in allowedExtensions properties and relevant system settings to ensure the right file types show up [modxcms#13702]

    Merge remote-tracking branch 'upstream/pr/13721' into 2.x

    * upstream/pr/13721:
      Bugfix 13702: FileManager/MediaBrowser don't show files. Whitespace causing problems in setting "allowedFileTypes" in MediaSource

commit 7cdc6e9
Merge: 9eea3d9 851cff4
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Tue Jan 30 00:18:01 2018 +0100

    Make sure requests to containers without the container suffix are redirected to the right url with container suffix [modxcms#13142]

    Merge remote-tracking branch 'upstream/pr/13142' into 2.x

    * upstream/pr/13142:
      Fix $containerSuffix is appended twice

commit 9eea3d9
Merge: 589afa2 21bcfe2
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Tue Jan 30 00:04:08 2018 +0100

    Add "filterPathSegment" output filter to turn a string into url-safe string [modxcms#13699]

    Merge remote-tracking branch 'upstream/pr/13699' into 2.x

    * upstream/pr/13699:
      Revert "change modifier name"
      change modifier name
      add output modifier filterPathSegment

commit 589afa2
Merge: 851e95d 4802026
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Jan 29 23:56:54 2018 +0100

    New resource option "Use current alias in alias path" to allow hiding resources from the URI [modxcms#11153, modxcms#13660]

    Merge remote-tracking branch 'upstream/pr/13660' into 2.x

    * upstream/pr/13660:
      Update translation (taken from evo)
      Fix alias_visible checkbox in quick create/update window
      Fix typo
      Add alias_visible checkbox to quick update resource form
      Refresh children URIs on save/update when alias_visible is marked as dirty
      Implement logic for hiding parent alias fragments
      Restate resource modext changes
      Undo accidental changes to modResource
      Set default checkbox value to checked
      Add english lexicon entries
      Move checkbox to the left side and add help text + label
      Add alias_visible checkbox to resource form
      Add upgrade script for new column field
      Add property to modResource class
      Add alias_visible to map files

commit 851e95d
Merge: b5fd81a 463c0e0
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Jan 29 23:43:54 2018 +0100

    Add "Purge Old Versions" to a packages' version listing, to clean up old versions modxcms#12818 modxcms#13654

    Merge remote-tracking branch 'upstream/pr/13654' into 2.x

    * upstream/pr/13654:
      Purge old versions of one package
      Missed documentation lines
      Purge old packages button in packages management

commit b5fd81a
Merge: c1409fd 8bc07e3
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Jan 29 22:15:52 2018 +0100

    Allow plugins OnDocFormRender to set the template to use with $resource->set('template', 3) like other fields

    Merge remote-tracking branch 'upstream/pr/13330' into 2.x

    * upstream/pr/13330:
      Fixed bug modxcms#13049 #modxbughunt

commit c1409fd
Merge: 435e59d 7a4e8fe
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Jan 29 21:43:22 2018 +0100

    Use a stricter type check in the resource tree to avoid potential uncaught errors in the resource tree modxcms#13262

    Merge remote-tracking branch 'upstream/pr/13262' into 2.x

    * upstream/pr/13262:
      Fix issue - not showing resources tree in modx manager.

commit 435e59d
Merge: 10692ef 18a375b
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Mon Jan 29 21:24:01 2018 +0100

    Support E_LEVEL constants in debug system setting and calls to $modx->setDebug. Fix "1" not being recognised as boolean true.

    Merge remote-tracking branch 'upstream/pr/12590' into 2.x

    * upstream/pr/12590:
      Add support for CONSTANT format for "debug" settings (modxcms#12579)

commit 2214b32
Author: Matthew Jones <matdave@Matthews-Mac-Pro.local>
Date:   Fri Jan 5 10:33:10 2018 -0600

    Modify getList processor to allow comma separated classKeys, and updating Changes tab action grid to request based on assigned class key as well as modResource

commit 2e56138
Author: Mat Dave Jones <mat@matdave.com>
Date:   Wed Jan 3 11:42:00 2018 -0600

    Add Manager Log Grid to Resource Data

    Adding a reference to the manager log grid source file for inclusion on the changes tab.

commit ed24f38
Author: Mat Dave Jones <mat@matdave.com>
Date:   Wed Jan 3 11:39:53 2018 -0600

    Tabbing error on line 112

commit 470bbcb
Author: Mat Dave Jones <mat@matdave.com>
Date:   Wed Jan 3 11:37:32 2018 -0600

    Adding manager log to the resource changes tab

    `classKey: 'mod%o%u'` is due to issue  modxcms#13733

commit 10692ef
Author: Jason Coward <jason@opengeek.com>
Date:   Thu Dec 14 14:38:32 2017 -0700

    Update version for 2.6.1-pl release

commit ba0b526
Merge: 62a3d33 4d92b16
Author: Jason Coward <jason@opengeek.com>
Date:   Thu Dec 14 10:31:55 2017 -0700

    Increase efficiency of cache refresh on autopublish events

    Merge remote-tracking branch 'origin/pr/13572' into 2.6.x

    * origin/pr/13572:
      Fix too aggressive cache clearing when triggering an autopublish event

commit a3b4356
Author: Fabian Christen <fabax1@gmx.de>
Date:   Thu Dec 14 16:32:34 2017 +0100

    Bugfix 13702: FileManager/MediaBrowser don't show files. Whitespace causing problems in setting "allowedFileTypes" in MediaSource

commit 62a3d33
Merge: 6382bed c86856a
Author: Jason Coward <jason@opengeek.com>
Date:   Wed Dec 13 20:08:59 2017 -0700

    Remove concatenated key from name field in Contexts grid

    Merge remote-tracking branch 'origin/pr/13372' into 2.6.x

    * origin/pr/13372:
      Edit Fixed modxcms#13371
      Fixed modxcms#13371

commit 6382bed
Merge: b41662e f87fffd
Author: Jason Coward <jason@opengeek.com>
Date:   Wed Dec 13 19:12:54 2017 -0700

    Prevent infinite loop when a modSymLink refers to itself

    Merge remote-tracking branch 'origin/pr/13710' into 2.6.x

    * origin/pr/13710:
      Symlink redirect loop

commit b41662e
Author: Jason Coward <jason@opengeek.com>
Date:   Wed Dec 13 09:12:15 2017 -0700

    Update lexicon translations

commit 4495a23
Merge: 9d70e63 17de4c5
Author: Jason Coward <jason@opengeek.com>
Date:   Mon Dec 11 13:51:33 2017 -0700

    Get only unique template paths for manager controllers

    Merge remote-tracking branch 'origin/pr/13717' into 2.6.x

    * origin/pr/13717:
      Get only unique template paths

commit 17de4c5
Author: Thomas Jakobi <thomas.jakobi@partout.info>
Date:   Mon Dec 11 11:18:28 2017 +0100

    Get only unique template paths

commit 4f2fdd4
Merge: 6dfeb3b 9d70e63
Author: Fabian Christen <fabax1@gmx.de>
Date:   Thu Nov 30 11:34:31 2017 +0100

    Merge remote-tracking branch 'upstream/2.x' into 2.x

commit f87fffd
Author: Roel Zeilstra <roelzeilstra@outlook.com>
Date:   Wed Nov 29 13:49:03 2017 +0100

    Symlink redirect loop

    Prevent an infinite loop when symlink equals the id of the resource.

commit 21bcfe2
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Fri Nov 17 21:17:24 2017 +0100

    Revert "change modifier name"

    This reverts commit 7bd1a2a.

commit 7bd1a2a
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Fri Nov 17 16:54:51 2017 +0100

    change modifier name

commit d9b592e
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Fri Nov 17 13:29:42 2017 +0100

    add output modifier filterPathSegment

commit 6dfeb3b
Merge: 3d41a15 bfb083c
Author: Fabian Christen <fabax1@gmx.de>
Date:   Sun Nov 5 18:28:06 2017 +0100

    Merge remote-tracking branch 'upstream/2.x' into 2.x

commit 463c0e0
Author: Thomas Jakobi <thomas.jakobi@partout.info>
Date:   Sat Nov 4 18:23:23 2017 +0100

    Purge old versions of one package

commit 1eacbf0
Author: Thomas Jakobi <thomas.jakobi@partout.info>
Date:   Sat Nov 4 18:22:45 2017 +0100

    Missed documentation lines

commit 4802026
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Wed Nov 1 09:09:50 2017 +0100

    Update translation (taken from evo)

commit d95002f
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Wed Nov 1 09:01:53 2017 +0100

    Fix alias_visible checkbox in quick create/update window

commit f4f32a3
Merge: 9fa3169 3033d02
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Mon Oct 30 12:50:59 2017 +0100

    Merge branch '2.x' into feature/exclude-resource-alias-for-child

commit 9fa3169
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Sun Oct 29 16:03:59 2017 +0100

    Fix typo

commit 0821f6c
Author: Lars Bratke <bratke@buntebrause.de>
Date:   Sun Oct 29 16:03:34 2017 +0100

    Add alias_visible checkbox to quick update resource form

commit 87c6749
Author: Thomas Jakobi <thomas.jakobi@partout.info>
Date:   Sat Oct 21 14:37:59 2017 +0200

    Purge old packages button in packages management

commit 4d92b16
Author: Mark Hamstra <hello@markhamstra.com>
Date:   Thu Jul 20 16:11:46 2017 +0200

    Fix too aggressive cache clearing when triggering an autopublish event

    Previously the autopublish would clear all default cache providers, including context_settings for all contexts, system_settings, lexicons, resources etc. With this patch, it brings the cache clear in line with what happens when you save a resource, by only clearing the relevant context_settings (because the aliasMap needs to be updated), resource, and the db cache.

    The reason this change is high-traffic sites with lots of contexts. The particular client I worked for this on has 300 (o.O) contexts with probably over 100.000 resources. When a front-end request triggers an auto publish, it would literally take the site down for a couple minutes as it regenerates all context caches (looping over all resources in all contexts to generate the aliasMap). Because multiple concurrent requests would hit the site, they'd all get stuck trying to generate those caches causing the error log to fill up with caching errors because they can't get a file lock (as another request is already doing the same thing).

    It's been tricky to test this in a simulated environment (I couldn't get enough traffic to hit my local dev server to consistently trigger the problem), but the fix has been verified on the client production site. Where previously an auto publish would cause the server load to go from 0.4 to 70 and it would take 5-10 minutes for the site to come back online, with the fix applied there has not been a noticeable increase when a page gets (un)published making it as quick as ever.

commit a608d12
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 20:30:38 2017 +0100

    Refresh children URIs on save/update when alias_visible is marked as dirty

commit f2ce1d0
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 20:26:39 2017 +0100

    Implement logic for hiding parent alias fragments

commit 7ce61d0
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 20:05:54 2017 +0100

    Restate resource modext changes

commit 930ec6f
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 20:03:35 2017 +0100

    Undo accidental changes to modResource

commit 6403ae5
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 20:01:03 2017 +0100

    Set default checkbox value to checked

commit 90325bd
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 19:04:25 2017 +0100

    Add english lexicon entries

commit b342df7
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 19:04:11 2017 +0100

    Move checkbox to the left side and add help text + label

commit 40aaf39
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 18:56:13 2017 +0100

    Add alias_visible checkbox to resource form

commit 19229ec
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 18:36:49 2017 +0100

    Add upgrade script for new column field

commit c06c796
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 18:30:57 2017 +0100

    Add property to modResource class

commit de970e2
Author: OptimusCrime <thomasgautv@hotmail.com>
Date:   Thu Mar 23 18:29:44 2017 +0100

    Add alias_visible to map files

commit c86856a
Author: Fabian Christen <fabax1@gmx.de>
Date:   Mon Mar 6 16:20:40 2017 +0100

    Edit Fixed modxcms#13371

commit 9e7f57a
Author: Fabian Christen <fabax1@gmx.de>
Date:   Mon Mar 6 16:11:46 2017 +0100

    Fixed modxcms#13371

commit 8bc07e3
Author: Jesse Visser <jesse@sterc.nl>
Date:   Fri Mar 3 14:27:05 2017 +0100

    Fixed bug modxcms#13049 #modxbughunt

commit 7a4e8fe
Author: Vasily Krakovetsky <vasis123@gmail.com>
Date:   Tue Jan 24 13:05:31 2017 +0300

    Fix issue - not showing resources tree in modx manager.

    This fix for error "TypeError: s[i].search is not a function" in `manager/assets/modext/widgets/core/tree/modx.tree.js` file on line 421 `sr = s[i].search(p);`. This is because first argument of `s` is not string. Better check "if `s[i]` is string or not" fix this issue.
    Screenshot from chrome debugger: https://yadi.sk/i/tUA6CT2h3AcoNk

commit 851cff4
Author: Hitko Development <development@hitko.si>
Date:   Sun Oct 2 21:19:22 2016 +0200

    Fix $containerSuffix is appended twice

    ```$identifier = "{$identifier}{$containerSuffix}";``` already appends the ```$containerSuffix```; Using ```"{$identifier}{$containerSuffix}"``` would append it again.

commit 18a375b
Author: Gildas NOEL <g.noel@ackwa.fr>
Date:   Mon Aug 24 18:59:14 2015 +0200

    Add support for CONSTANT format for "debug" settings (modxcms#12579)

    Constant E_ALL, E_ERROR… are now supported. At this point, combine form
    like « E_ALL & ~E_NOTICE » are not supported. Replace XPDO setDebug()
    by a setLogLevel() in this case and add some checks on values.
@labr1005 labr1005 deleted the feature/exclude-resource-alias-for-child branch June 11, 2018 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-core proposal Proposal about improvement aka RFC. Need to be discussed before start implementation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants