[TASK] Remove deprecated code from ext:workspaces 72/45372/6
authorWouter Wolters <typo3@wouterwolters.nl>
Sat, 19 Dec 2015 19:55:40 +0000 (20:55 +0100)
committerOliver Hader <oliver.hader@typo3.org>
Tue, 29 Dec 2015 18:11:20 +0000 (19:11 +0100)
* remove rewritten toolbar item (#62800)
* remove rewritten notification parts (#35245)

Resolves: #72464
Releases: master
Change-Id: If2882bfc8c4bf47608cdec50ac30f5d9dbaeec12
Reviewed-on: https://review.typo3.org/45372
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
15 files changed:
typo3/sysext/core/Documentation/Changelog/master/Breaking-72464-RemovedDeprecatedCodeFromExtworkspaces.rst [new file with mode: 0644]
typo3/sysext/workspaces/Classes/ExtDirect/ToolbarMenu.php [deleted file]
typo3/sysext/workspaces/Classes/Service/StagesService.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
typo3/sysext/workspaces/Resources/Private/Language/locallang_csh_sysws_stage.xlf
typo3/sysext/workspaces/Resources/Private/Language/locallang_db.xlf
typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
typo3/sysext/workspaces/ext_tables.sql

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72464-RemovedDeprecatedCodeFromExtworkspaces.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72464-RemovedDeprecatedCodeFromExtworkspaces.rst
new file mode 100644 (file)
index 0000000..97b123a
--- /dev/null
@@ -0,0 +1,43 @@
+==============================================================
+Breaking: #72464 - Removed deprecated code from ext:workspaces
+==============================================================
+
+Description
+===========
+
+The following components have been changed during the development of TYPO3 CMS 7
+and lead to deprecated code which is removed in TYPO3 CMS 8.
+
++ remove rewritten toolbar item (#62800)
++ remove rewritten notification parts (#35245)
+
+
+Impact
+======
+
+Using or extending \TYPO3\CMS\Workspaces\ExtDirect\ToolbarMenu will fail since
+it's removed.
+
+Using \TYPO3\CMS\Workspaces\Service\StagesService::getNotificationMode($stageId)
+will fail.
+
+Relying on the following database fields in the tables sys_workspace and
+sys_workspace_stage will fail:
++ sys_workspace.edit_notification_mode
++ sys_workspace.publish_notification_mode
++ sys_workspace.execute_notification_mode
++ sys_workspace_stage.notification_mode
+
+
+Affected Installations
+======================
+
+All installations using workspaces and notifications that have not been migrated
+to TYPO3 CMS 7, yet.
+
+
+Migration
+=========
+
+First migrate to TYPO3 CMS 7 and use the accordant upgrade wizard
+(WorkspacesNotificationSettingsUpdate) and then upgrade to TYPO3 CMS 8.
\ No newline at end of file
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ToolbarMenu.php b/typo3/sysext/workspaces/Classes/ExtDirect/ToolbarMenu.php
deleted file mode 100644 (file)
index 2a07ace..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-namespace TYPO3\CMS\Workspaces\ExtDirect;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * ExtDirect toolbar menu
- * @deprecated since TYPO3 CMS 7, this file will be removed in TYPO3 CMS 8, as the AJAX functionality is now done via plain AJAX
- */
-class ToolbarMenu
-{
-    /**
-     * Toggle workspace preview mode
-     *
-     * @param $parameter
-     * @return array
-     * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8, not in use anymore
-     */
-    public function toggleWorkspacePreviewMode($parameter)
-    {
-        \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-        $newState = $GLOBALS['BE_USER']->user['workspace_preview'] ? '0' : '1';
-        $GLOBALS['BE_USER']->setWorkspacePreview($newState);
-        return array('newWorkspacePreviewState' => $newState);
-    }
-
-    /**
-     * Set workspace
-     *
-     * @param $parameter
-     * @return array
-     * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8, not in use anymore
-     */
-    public function setWorkspace($parameter)
-    {
-        \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-        $workspaceId = (int)$parameter->workSpaceId;
-        $pageId = (int)$parameter->pageId;
-
-        $GLOBALS['BE_USER']->setWorkspace($workspaceId);
-
-        while ($pageId) {
-            $page = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordWSOL('pages', $pageId, '*',
-                ' AND pages.t3ver_wsid IN (0, ' . $workspaceId . ')');
-            if ($page) {
-                if ($GLOBALS['BE_USER']->doesUserHaveAccess($page, 1)) {
-                    break;
-                }
-            } else {
-                $page = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecord('pages', $pageId);
-            }
-            $pageId = $page['pid'];
-        }
-
-        return array(
-            'title' => \TYPO3\CMS\Workspaces\Service\WorkspaceService::getWorkspaceTitle($workspaceId),
-            'id' => $workspaceId,
-            'page' => (isset($page['uid']) && ($parameter->pageId == $page['uid'])) ? null : (int)$page['uid']
-        );
-    }
-}
index 7b77600..2ad306e 100644 (file)
@@ -757,42 +757,6 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
     }
 
     /**
-     * Returns the notification mode from stage configuration
-     *
-     * Return values:
-     * 0 = notify someone / old way / default setting
-     * 1 = notify all responsible users (some users checked per default and you're not allowed to uncheck them)
-     * 2 = notify all responsible users (all users are checked and nothing can be changed during stage change)
-     *
-     * @param int $stageId Stage id to return the notification mode for
-     * @return int
-     * @throws \InvalidArgumentException
-     */
-    public function getNotificationMode($stageId)
-    {
-        if (!MathUtility::canBeInterpretedAsInteger($stageId)) {
-            throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'));
-        }
-        switch ($stageId) {
-            case self::STAGE_PUBLISH_EXECUTE_ID:
-
-            case self::STAGE_PUBLISH_ID:
-                $workspaceRecord = BackendUtility::getRecord('sys_workspace', $this->getWorkspaceId());
-                return $workspaceRecord['publish_notification_mode'];
-                break;
-            case self::STAGE_EDIT_ID:
-                $workspaceRecord = BackendUtility::getRecord('sys_workspace', $this->getWorkspaceId());
-                return $workspaceRecord['edit_notification_mode'];
-                break;
-            default:
-                $workspaceStage = BackendUtility::getRecord(self::TABLE_STAGE, $stageId);
-                if (is_array($workspaceStage) && isset($workspaceStage['notification_mode'])) {
-                    return $workspaceStage['notification_mode'];
-                }
-        }
-    }
-
-    /**
      * @return RecordService
      */
     public function getRecordService()
      * @return RecordService
      */
     public function getRecordService()
index b6bc695..d4a3fd6 100644 (file)
@@ -178,19 +178,6 @@ return array(
             ),
             'default' => 0
         ),
             ),
             'default' => 0
         ),
-        // @deprecated not used anymore
-        'edit_notification_mode' => array(
-            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.edit_notification_mode',
-            'config' => array(
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => array(
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
-                )
-            )
-        ),
         'edit_notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:edit_allow_notificaton_settings:BIT:1',
         'edit_notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:edit_allow_notificaton_settings:BIT:1',
@@ -235,19 +222,6 @@ return array(
                 'cols' => 3,
             )
         ),
                 'cols' => 3,
             )
         ),
-        // @deprecated not used anymore
-        'publish_notification_mode' => array(
-            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_notification_mode',
-            'config' => array(
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => array(
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
-                )
-            )
-        ),
         'publish_notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:publish_allow_notificaton_settings:BIT:1',
         'publish_notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:publish_allow_notificaton_settings:BIT:1',
index 7ab4b7f..718ec13 100644 (file)
@@ -64,18 +64,6 @@ return array(
                 'type' => 'passthrough'
             )
         ),
                 'type' => 'passthrough'
             )
         ),
-        'notification_mode' => array(
-            'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_mode',
-            'config' => array(
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => array(
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
-                    array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
-                )
-            )
-        ),
         'notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:allow_notificaton_settings:BIT:1',
         'notification_defaults' => array(
             'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
             'displayCond' => 'FIELD:allow_notificaton_settings:BIT:1',
index 127052a..0a31961 100644 (file)
@@ -15,9 +15,6 @@
                        <trans-unit id="default_mailcomment.description">
                                <source>Here its possible to define a standard mail comment which will be inserted into the stage change mail. When no standard mail comment was defined here its possible to write a comment for the mail on every stage change.</source>
                        </trans-unit>
                        <trans-unit id="default_mailcomment.description">
                                <source>Here its possible to define a standard mail comment which will be inserted into the stage change mail. When no standard mail comment was defined here its possible to write a comment for the mail on every stage change.</source>
                        </trans-unit>
-                       <trans-unit id="notification_mode.description">
-                               <source>You can choose one of three settings for the recipient suggestion list on stage change. In the most configurations the default option is a good choice. For exact explanation about the single options please refer to the documentation.</source>
-                       </trans-unit>
                        <trans-unit id="notification_defaults.description">
                                <source>Select these backend users or backend groups that should be selected per default to receive a notification mail. Select only users/groups that are also selected as responsible for this stage.</source>
                        </trans-unit>
                        <trans-unit id="notification_defaults.description">
                                <source>Select these backend users or backend groups that should be selected per default to receive a notification mail. Select only users/groups that are also selected as responsible for this stage.</source>
                        </trans-unit>
index 0f6dcb2..9e98631 100644 (file)
                        <trans-unit id="tabs.notification_settings">
                                <source>Notification settings</source>
                        </trans-unit>
                        <trans-unit id="tabs.notification_settings">
                                <source>Notification settings</source>
                        </trans-unit>
-                       <trans-unit id="sys_workspace.edit_notification_mode">
-                               <source>Edit stage: Recipient suggestion checkboxes</source>
-                       </trans-unit>
-                       <trans-unit id="sys_workspace.notification_mode.0">
-                               <source>All are selected per default (can be changed)</source>
-                       </trans-unit>
-                       <trans-unit id="sys_workspace.notification_mode.1">
-                               <source>Some are selected per default (defaults cannot be unchecked)</source>
-                       </trans-unit>
-                       <trans-unit id="sys_workspace.notification_mode.2">
-                               <source>All are selected per default (cannot be changed)</source>
-                       </trans-unit>
                        <trans-unit id="sys_workspace.edit_notification_defaults">
                                <source>Edit stage: default notification mail recipients</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace.edit_allow_notificaton_settings">
                                <source>Allow notification settings during stage change back to edit stage</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace.edit_notification_defaults">
                                <source>Edit stage: default notification mail recipients</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace.edit_allow_notificaton_settings">
                                <source>Allow notification settings during stage change back to edit stage</source>
                        </trans-unit>
-                       <trans-unit id="sys_workspace.publish_notification_mode">
-                               <source>Ready to publish stage: Recipient suggestion checkboxes</source>
-                       </trans-unit>
                        <trans-unit id="sys_workspace.publish_notification_defaults">
                                <source>Ready to publish stage: default notification mail recipients</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace.publish_notification_defaults">
                                <source>Ready to publish stage: default notification mail recipients</source>
                        </trans-unit>
@@ -60,9 +45,6 @@
                        <trans-unit id="sys_workspace.execute_notification_defaults">
                                <source>Publishing execute stage: default notification mail recipients</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace.execute_notification_defaults">
                                <source>Publishing execute stage: default notification mail recipients</source>
                        </trans-unit>
-                       <trans-unit id="sys_workspace_stage.notification_mode">
-                               <source>Recipient suggestion checkboxes</source>
-                       </trans-unit>
                        <trans-unit id="sys_workspace_stage.notification_defaults">
                                <source>Default notification mail recipients</source>
                        </trans-unit>
                        <trans-unit id="sys_workspace_stage.notification_defaults">
                                <source>Default notification mail recipients</source>
                        </trans-unit>
index aa49397..5ed83c3 100644 (file)
@@ -1,10 +1,10 @@
 "sys_workspace"
 "sys_workspace"
-,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_mode","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_mode","publish_notification_defaults","publish_allow_notificaton_settings"
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
 "sys_workspace_stage"
 "sys_workspace_stage"
-,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_mode","notification_defaults","allow_notificaton_settings"
-,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,,0
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
index e4f6d82..08fdc5c 100644 (file)
@@ -1,10 +1,10 @@
 "sys_workspace"
 "sys_workspace"
-,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_mode","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_mode","publish_notification_defaults","publish_allow_notificaton_settings"
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
 "sys_workspace_stage"
 "sys_workspace_stage"
-,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_mode","notification_defaults","allow_notificaton_settings"
-,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,,0
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
index 72b428d..169aa18 100644 (file)
@@ -1,10 +1,10 @@
-sys_workspace
-,uid,pid,deleted,title,adminusers,members,reviewers,db_mountpoints,file_mountpoints,freeze,live_edit,vtypes,swap_modes,publish_access,custom_stages,stagechg_notification,edit_notification_mode,edit_notification_defaults,edit_allow_notificaton_settings,publish_notification_mode,publish_notification_defaults,publish_allow_notificaton_settings
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-sys_workspace_stage
-,uid,pid,tstamp,deleted,sorting,title,responsible_persons,default_mailcomment,parentid,parenttable,notification_mode,notification_defaults,allow_notificaton_settings
-,1,0,1290048921,0,1,"Stage 1",be_users_3,,1,sys_workspace,0,,0
+"sys_workspace"
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage"
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
index 9ddf503..377d66c 100644 (file)
@@ -1,10 +1,10 @@
 "sys_workspace"
 "sys_workspace"
-,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_mode","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_mode","publish_notification_defaults","publish_allow_notificaton_settings"
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
 "sys_workspace_stage"
 "sys_workspace_stage"
-,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_mode","notification_defaults","allow_notificaton_settings"
-,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,,0
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
index 585e540..d84f851 100644 (file)
@@ -1,10 +1,10 @@
-sys_workspace
-,uid,pid,deleted,title,adminusers,members,reviewers,db_mountpoints,file_mountpoints,freeze,live_edit,vtypes,swap_modes,publish_access,custom_stages,stagechg_notification,edit_notification_mode,edit_notification_defaults,edit_allow_notificaton_settings,publish_notification_mode,publish_notification_defaults,publish_allow_notificaton_settings
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-sys_workspace_stage
-,uid,pid,tstamp,deleted,sorting,title,responsible_persons,default_mailcomment,parentid,parenttable,notification_mode,notification_defaults,allow_notificaton_settings
-,1,0,1290048921,0,1,"Stage 1",be_users_3,,1,sys_workspace,0,,0
+"sys_workspace"
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage"
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
index 988cc72..a8a05be 100644 (file)
@@ -1,10 +1,10 @@
-sys_workspace
-,uid,pid,deleted,title,adminusers,members,reviewers,db_mountpoints,file_mountpoints,freeze,live_edit,vtypes,swap_modes,publish_access,custom_stages,stagechg_notification,edit_notification_mode,edit_notification_defaults,edit_allow_notificaton_settings,publish_notification_mode,publish_notification_defaults,publish_allow_notificaton_settings
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-sys_workspace_stage
-,uid,pid,tstamp,deleted,sorting,title,responsible_persons,default_mailcomment,parentid,parenttable,notification_mode,notification_defaults,allow_notificaton_settings
-,1,0,1290048921,0,1,"Stage 1",be_users_3,,1,sys_workspace,0,,0
+"sys_workspace"
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+"sys_workspace_stage"
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
 "sys_language",,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,
index 6bbb10e..46968cc 100644 (file)
@@ -1,10 +1,10 @@
 "sys_workspace"
 "sys_workspace"
-,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_mode","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_mode","publish_notification_defaults","publish_allow_notificaton_settings"
-,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+,"uid","pid","deleted","title","adminusers","members","reviewers","db_mountpoints","file_mountpoints","freeze","live_edit","vtypes","swap_modes","publish_access","custom_stages","stagechg_notification","edit_notification_defaults","edit_allow_notificaton_settings","publish_notification_defaults","publish_allow_notificaton_settings"
+,1,0,0,"Workspace #1",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
+,2,0,0,"Workspace #2",,,,,,0,0,0,0,0,0,0,0,0,0,0,0
 "sys_workspace_stage"
 "sys_workspace_stage"
-,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_mode","notification_defaults","allow_notificaton_settings"
-,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,,0
+,"uid","pid","tstamp","deleted","sorting","title","responsible_persons","default_mailcomment","parentid","parenttable","notification_defaults","allow_notificaton_settings"
+,1,0,1290048921,0,1,"Stage 1","be_users_3",,1,"sys_workspace",0,0
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
 "sys_language"
 ,"uid","pid","hidden","title","flag"
 ,1,0,0,"Dansk","dk"
index ebc980b..56c5b46 100644 (file)
@@ -22,15 +22,12 @@ CREATE TABLE sys_workspace (
        publish_access tinyint(3) DEFAULT '0' NOT NULL,
        custom_stages int(11) DEFAULT '0' NOT NULL,
        stagechg_notification tinyint(3) DEFAULT '0' NOT NULL,
        publish_access tinyint(3) DEFAULT '0' NOT NULL,
        custom_stages int(11) DEFAULT '0' NOT NULL,
        stagechg_notification tinyint(3) DEFAULT '0' NOT NULL,
-       edit_notification_mode tinyint(3) DEFAULT '0' NOT NULL,
        edit_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        edit_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        edit_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
        edit_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        edit_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        edit_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
-       publish_notification_mode tinyint(3) DEFAULT '0' NOT NULL,
        publish_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        publish_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        publish_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
        publish_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        publish_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        publish_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
-       execute_notification_mode tinyint(3) DEFAULT '0' NOT NULL,
        execute_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        execute_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        execute_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
        execute_notification_defaults varchar(255) DEFAULT '' NOT NULL,
        execute_notification_preselection tinyint(3) DEFAULT '3' NOT NULL,
        execute_allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
@@ -54,7 +51,6 @@ CREATE TABLE sys_workspace_stage (
        default_mailcomment text,
        parentid int(11) DEFAULT '0' NOT NULL,
        parenttable tinytext NOT NULL,
        default_mailcomment text,
        parentid int(11) DEFAULT '0' NOT NULL,
        parenttable tinytext NOT NULL,
-       notification_mode tinyint(3) DEFAULT '0' NOT NULL,
        notification_defaults varchar(255) DEFAULT '' NOT NULL,
        allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
        notification_preselection tinyint(3) DEFAULT '8' NOT NULL,
        notification_defaults varchar(255) DEFAULT '' NOT NULL,
        allow_notificaton_settings tinyint(3) DEFAULT '0' NOT NULL,
        notification_preselection tinyint(3) DEFAULT '8' NOT NULL,