From b89af99e3c89949215f1b7f288aed37c11b135ac Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Tue, 1 Nov 2011 18:02:52 +0100 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 85aebcb9ce4bd2d0357b86435fc5d6b4effee03b Author: Thomas von Deyen Date: Tue Nov 1 17:58:37 2011 +0100 Picture in element layout fixes commit 4b713d1da7debef6c5a628e87be568ccc33e320d Author: Thomas von Deyen Date: Tue Nov 1 17:58:21 2011 +0100 Fixes switching of standard and flash uploader commit 962913abd9582aa644db1b1010d2e4b8fe9b7c8e Author: Thomas von Deyen Date: Tue Nov 1 17:57:59 2011 +0100 Fixes a bug with single quote strings in update page notice commit da87cee56c6f06827203bffc3028136997b1054e Author: Thomas von Deyen Date: Tue Nov 1 17:20:55 2011 +0100 Changes License to BSD and prepared readme for release commit 67e3764c8bfc5427d22d957a7545494e80cca4d4 Author: Thomas von Deyen Date: Tue Nov 1 16:48:40 2011 +0100 RSS Feed refactoring and fixes. You can now define elements that shroud be in your feed and mark contents as rss title and rss description. commit 055dbaab1fe4139dbbc30f819ea4f6fac52d92bd Author: Thomas von Deyen Date: Tue Nov 1 13:12:27 2011 +0100 Standardset styling for searchresults commit 7d0c30a7ae54adc94301ed83dcac09673796d51c Author: Thomas von Deyen Date: Tue Nov 1 13:09:02 2011 +0100 Standardset styling commit 8c17a82a99d8486072ba9f30f49a565647dd5d1a Author: Thomas von Deyen Date: Tue Nov 1 13:08:47 2011 +0100 Refactored search results commit 582d1ae0799c3bf2f7ace8c92eac92d7106af3e4 Author: Thomas von Deyen Date: Tue Nov 1 13:08:21 2011 +0100 Error messages translation commit 28d72c09b9e33cec6fe9031aec13b307e7ab6f01 Author: Thomas von Deyen Date: Tue Nov 1 13:08:06 2011 +0100 Setting trashed elements not public commit b48ee02bdf3537db9c6b3f5540005454a904d034 Author: Robin Böning Date: Tue Nov 1 10:33:45 2011 +0100 Fixes page caching. Closes #84 commit 235f4971fff2f8d9be027c636e8cdd9134e75d9e Merge: 9ef37be f1d23e7 Author: Robin Böning Date: Tue Nov 1 10:14:58 2011 +0100 Merge branch 'next_stable' of github.com:magiclabs/alchemy_cms into next_stable Conflicts: lib/rails/generators/alchemy/plugin/templates/config.yml commit 9ef37beda0e54dbd60cbc643838a042cfdbfcb4e Author: Robin Böning Date: Tue Nov 1 10:08:57 2011 +0100 adds description for icon commit f1d23e798a965703618086640cdd9d3f1015e0b6 Author: Thomas von Deyen Date: Tue Nov 1 10:05:08 2011 +0100 Fixes cache sweeping. Closes #85 commit 89354cdbcde7f86b90de869550a65f9bd75d1cfc Author: Thomas von Deyen Date: Mon Oct 31 20:44:27 2011 +0100 Fixes bug in standard set contact form view commit 9c9833a245344eb53fca6857d98013d735891c32 Merge: 62875e7 a04df11 Author: Thomas von Deyen Date: Mon Oct 31 20:27:07 2011 +0100 Merge branch 'next_stable' of github.com:magiclabs/alchemy_cms into next_stable commit 62875e7db59d2790e1d9ea97781b33f828c97715 Author: Thomas von Deyen Date: Mon Oct 31 20:26:26 2011 +0100 Fixes a bug in TrashController where trashed Elements could not be rendered commit a04df11ddebdadf0dfdcc34ed2334484e5decc2e Author: Robin Böning Date: Mon Oct 31 00:36:21 2011 +0100 fixes Issue #81 - render_elements method finds a Page regardless of the language when using fallback option commit 2d5e80fcd6cff47b78b6e2c498778cf57d7316d9 Author: Thomas von Deyen Date: Sun Oct 30 21:33:24 2011 +0100 rc6 commit 9da9e8e713251880eb6b89ae54b0728f92997e8e Author: Thomas von Deyen Date: Sun Oct 30 21:17:14 2011 +0100 Fixes bug in where a content could not be updated via ajax commit aca1a96fe60504d01d1643f707bd800cd9ca58a1 Author: Thomas von Deyen Date: Fri Oct 28 21:54:49 2011 +0200 Radiobutton style and default for button enabling commit c2ce89768deeb8176ac24b5cf67c88db15a5b4a1 Author: Thomas von Deyen Date: Fri Oct 28 20:47:38 2011 +0200 Adding a small button class commit fc7685f837e0d482ffbf8dda7a044ab16147f591 Author: Thomas von Deyen Date: Fri Oct 28 19:17:21 2011 +0200 Refactors plugin generator Rails 3 style commit 8bbf373ee2b29c21538756550393fc0b152c8ff1 Author: Thomas von Deyen Date: Fri Oct 28 17:45:01 2011 +0200 Updating jQuery and jQuery UI. And adding new modules autocomplete and datepicker commit 6244fa28065e3bf30590a81cf1fbf41fd80cc3bc Author: Thomas von Deyen Date: Fri Oct 28 17:44:19 2011 +0200 Slight layout fixes commit fe8f3c7d61e0ef8637ddd3c5a420b6333320fd41 Author: Thomas von Deyen Date: Thu Oct 27 18:22:34 2011 +0200 Overlay bg color commit 0104304bbf3d295b3e80104e400f202172d690c7 Author: Thomas von Deyen Date: Thu Oct 27 17:59:28 2011 +0200 Some layout fixes commit 0260d4e91ab19d6ce5d37b57f27ae2b1dd90fc67 Author: Thomas von Deyen Date: Thu Oct 27 17:42:13 2011 +0200 Fresh new GUI commit 1dbebc8e9a53f02fd259bf4084f5ca1a9d9dadce Author: Thomas von Deyen Date: Wed Oct 26 19:58:29 2011 +0200 Reverts the changes of authorization files declaration commit 36c929b25554b452a8fc2158e7e87e532eb1d22b Author: Thomas von Deyen Date: Wed Oct 26 19:27:54 2011 +0200 Fixes auth files declaration commit 1fce9cadada714989d364f32434825e1eed8caa4 Author: Thomas von Deyen Date: Wed Oct 26 18:08:30 2011 +0200 Removes authorization_rules loading from plugins commit 0d60344f92648e2a551029ba4d64e10d1946864a Author: Thomas von Deyen Date: Wed Oct 26 17:57:00 2011 +0200 Fixes issue #80: Installer fails under Ruby 1.9 commit 0b9b1fd9583a03af3fd1fc2b8d24502e24bfb52e Author: Thomas von Deyen Date: Wed Oct 26 13:50:15 2011 +0200 Fixes Gem dependencies commit a1020091a539eff733e4ba8cf83c539ae255d142 Merge: 49515e9 81cff2b Author: Thomas von Deyen Date: Wed Oct 26 00:43:03 2011 -0700 Merge pull request #79 from masche842/next_stable Yaml-Syntax commit 81cff2bd052e4e840b8255691d15c8d6b124f49b Author: masche842 Date: Wed Oct 26 14:49:16 2011 +0800 changed syntax in locales to be compatible with psych commit 49515e9ad68870450a113917ea838f5975dad601 Author: Thomas von Deyen Date: Tue Oct 25 00:53:29 2011 +0300 Update README.md --- README.md | 2 -- app/sweepers/pages_sweeper.rb | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c17311fdb3..312458e180 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ About **CAUTION: This branch is a pre alpha development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms), or [next_stable](https://github.com/magiclabs/alchemy_cms/tree/next_stable) branch.** -Alchemy is a fully featured Content Management System (CMS) with an gorgeous Userinterface. - Features -------- diff --git a/app/sweepers/pages_sweeper.rb b/app/sweepers/pages_sweeper.rb index 05834579ff..c6493bca3c 100644 --- a/app/sweepers/pages_sweeper.rb +++ b/app/sweepers/pages_sweeper.rb @@ -34,4 +34,14 @@ def check_multipage_elements(page) end end + def expire_page(page) + return if page.do_not_sweep + expire_action( + :controller => '/pages', + :action => :show, + :urlname => page.urlname_was, + :lang => multi_language? ? page.language_code : nil + ) + end + end