diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 0107ff973..c29b0c840 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -31,7 +31,7 @@ - fix [ 1288770 ] Couldn't call method www_view on asset - fix [ 1278672 ] Timezones does not still not work properly in webgui - fix [ 1281347 ] double slash in URL (in style template WebGUI 6) - + - fix [ 1289336 ] Trash cannot be emptied 6.7.4 gamma (documentation fix) 6.7.4 - fix [ 1279861 ] POD errors in 6.7.3 diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index ed5246f0c..7625f14ff 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -55,18 +55,6 @@ our $HELP = { related => [ ], }, - 'trash empty' => { - title => '696', - body => '651', - fields => [ - ], - related => [ - { - tag => 'trash manage', - namespace => 'WebGUI' - } - ] - }, 'style template' => { title => '1073', body => '1074', @@ -561,10 +549,6 @@ our $HELP = { fields => [ ], related => [ - { - tag => 'trash empty', - namespace => 'WebGUI' - } ] }, 'clipboard manage' => { diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 8915b4184..bd1973b28 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -1005,20 +1005,18 @@ That particular example will help you get good ranking on search engines. }, '961' => { - message => q|The trash is a special system location where deleted content is temporarily stored. Items in the trash may be managed individually. You may cut an item to the clipboard or permanently delete it by selecting the appropriate icon. You may also purge/delete all items in the trash by choosing the Empty trash menu option. -

Title
The name of the item in the trash. You may view the item by selecting the title. -

Type
The type of content. For instance, a Page, Article, EventsCalendar, etc. -

Trash Date
The date and time the item was added to the trash -

Previous Location
The location where the item was previously found. You may view the previous location by selecting the location.

Username
The username of the individual who placed the item in the trash. This optional field is only visible in shared trash environments or when an administrator is managing the system trash. -

Note that when Pages are in the clipboard that their URLs are still active in the WebGUI + message => q|

The trash is a special system location where deleted content is temporarily stored. Items in the trash may be cut to the clipboard or restored to their previous location.

+

Title
The name of the item in the trash. You may view the item by selecting the title.

+

Type
The type of content. For instance, a Page, Article, EventsCalendar, etc.

+

Last Updated
The date and time the item was added to the trash.

+

Size
The size of the Asset.

+

Note that when Assets are in the trash that their URLs are still active in the WebGUI system. If another page with an identical URL is created, the URL of the newly created page -will be modified to make it unique.|, - lastUpdated => 1101775325, - }, - - '651' => { - message => q|Emptying your trash will remove these assets from your site forever. Are you sure you want to continue?|, - lastUpdated => 1101514049 +will be modified to make it unique.

+

It is no longer possible to manually delete items from the trash, due to versioning. Items in the trash will be automatically +removed from the system after a set period of time. That period of time is set in the config file, TrashExpiredContent_offset

+

To truly delete an Asset from the system, rollback all releases of it under "Content Versioning"

|, + lastUpdated => 1127337912, }, '498' => { @@ -3054,11 +3052,6 @@ Privileges and styles assigned to pages in the package will not be copied when t lastUpdated => 1038432387 }, - '696' => { - message => q|Trash, Empty|, - lastUpdated => 1031514049 - }, - 'ends with' => { message => q|Ends With|, lastUpdated => 1089039511