Remove unused properties

flack · Oct 10, 2018 · fc9e64b · fc9e64b
1 parent e10740c
commit fc9e64b
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 90 deletions.
diff --git a/lib/midcom/db/person.php b/lib/midcom/db/person.php
@@ -27,7 +27,6 @@
  * @property string $country
  * @property string $fax
  * @property integer $orgOpenpsaAccesstype
- * @property integer $orgOpenpsaWgtype
  * @package midcom.db
  */
 class midcom_db_person extends midcom_core_dbaobject

diff --git a/lib/org/openpsa/calendar/event.php b/lib/org/openpsa/calendar/event.php
@@ -24,7 +24,6 @@
  * @property string $externalGuid
  * @property string $vCalSerialized
  * @property integer $orgOpenpsaAccesstype
- * @property integer $orgOpenpsaWgtype
  * @property string $orgOpenpsaOwnerWg
  * @package org.openpsa.calendar
  */

diff --git a/lib/org/openpsa/contacts/group.php b/lib/org/openpsa/contacts/group.php
@@ -35,7 +35,6 @@
  * @property string $vatNo
  * @property integer $orgOpenpsaAccesstype
  * @property integer $orgOpenpsaObtype
- * @property integer $orgOpenpsaWgtype
  * @package org.openpsa.contacts
  */
 class org_openpsa_contacts_group_dba extends midcom_core_dbaobject

diff --git a/lib/org/openpsa/contacts/list.php b/lib/org/openpsa/contacts/list.php
@@ -16,7 +16,6 @@
  * @property string $customerId
  * @property integer $orgOpenpsaAccesstype
  * @property integer $orgOpenpsaObtype
- * @property integer $orgOpenpsaWgtype
  * @package org.openpsa.contacts
  */
 class org_openpsa_contacts_list_dba extends midcom_core_dbaobject

diff --git a/lib/org/openpsa/contacts/person.php b/lib/org/openpsa/contacts/person.php
@@ -27,7 +27,6 @@
  * @property string $country
  * @property string $fax
  * @property integer $orgOpenpsaAccesstype
- * @property integer $orgOpenpsaWgtype
  * @package org.openpsa.contacts
  */
 class org_openpsa_contacts_person_dba extends midcom_db_person

diff --git a/lib/org/openpsa/directmarketing/campaign.php b/lib/org/openpsa/directmarketing/campaign.php
@@ -16,7 +16,6 @@
  * @property string $rulesSerialized
  * @property integer $orgOpenpsaAccesstype
  * @property integer $orgOpenpsaObtype
- * @property integer $orgOpenpsaWgtype
  * @property string $orgOpenpsaOwnerWg
  * @package org.openpsa.directmarketing
  */

diff --git a/lib/org/openpsa/directmarketing/campaign/ruleresolver.php b/lib/org/openpsa/directmarketing/campaign/ruleresolver.php
@@ -382,7 +382,6 @@ public static function list_object_properties(midcom_core_dbaobject $object, mid
         $skip_properties = [
             // These will be deprecated soon
             'orgOpenpsaAccesstype',
-            'orgOpenpsaWgtype',
             // Skip metadata for now
             'metadata'
         ];

diff --git a/lib/org/openpsa/documents/document.php b/lib/org/openpsa/documents/document.php
@@ -21,10 +21,6 @@
 	        	status seems to be a reserved word in some layer between DM -> DB
  * @property string $content plaintext representation of content, non-ML
  * @property integer $orgOpenpsaAccesstype Shortcut for various ACL scenarios
- * @property integer $orgOpenpsaWgtype will contain bitmask as integer
-            - 00(int=0) not a workgroup
-            - 01(int=1) is workgroup but not active
-            - 11(int=3) active workgroup
  * @property string $orgOpenpsaOwnerWg The "owner" workgroup of this object
  * @package org.openpsa.documents
  */

diff --git a/lib/org/openpsa/projects/config/schemadb_default_project.inc b/lib/org/openpsa/projects/config/schemadb_default_project.inc
@@ -147,16 +147,6 @@
             'end_fieldset' => '',
         ],
 
-        'orgOpenpsaWgtype' => [
-            'title' => 'create workgroups for this project',
-            'storage' => 'orgOpenpsaWgtype',
-            'type' => 'boolean',
-            'widget' => 'checkbox',
-            'start_fieldset' => [
-                'title' => 'access control',
-                'css_group' => 'area acl',
-            ],
-        ],
         'orgOpenpsaAccesstype' => [
             'title' => 'access type',
             'storage' => 'orgOpenpsaAccesstype',
@@ -165,6 +155,10 @@
                  'options' => org_openpsa_core_acl::get_options(),
             ],
             'widget' => 'select',
+            'start_fieldset' => [
+                'title' => 'access control',
+                'css_group' => 'area acl',
+            ],
         ],
         'orgOpenpsaOwnerWg' => [
             'title' => 'workgroup',

diff --git a/lib/org/openpsa/projects/task.php b/lib/org/openpsa/projects/task.php
@@ -28,18 +28,11 @@
  * @property integer $priority
  * @property integer $orgOpenpsaAccesstype Shortcut for various ACL scenarios
  * @property integer $orgOpenpsaObtype Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc)
- * @property integer $orgOpenpsaWgtype will contain bitmask as integer
-            - 00(int=0) not a workgroup
-            - 01(int=1) is workgroup but not active
-            - 11(int=3) active workgroup
  * @property string $orgOpenpsaOwnerWg The "owner" workgroup of this object
  * @package org.openpsa.projects
  */
 class org_openpsa_projects_task_dba extends midcom_core_dbaobject
 {
-    const WGTYPE_NONE = 0;
-    const WGTYPE_INACTIVE = 1;
-    const WGTYPE_ACTIVE = 3;
     const OBTYPE = 6002;
 
     public $__midcom_class_name__ = __CLASS__;
@@ -243,10 +236,6 @@ private function _prepare_save()
             return false;
         }
 
-        if ($this->orgOpenpsaWgtype == self::OBTYPE) {
-            $this->orgOpenpsaWgtype = self::WGTYPE_NONE;
-        }
-
         if ($agreement = $this->get_agreement()) {
             // Get customer company into cache from agreement's sales project
             try {

diff --git a/lib/org/openpsa/sales/salesproject.php b/lib/org/openpsa/sales/salesproject.php
@@ -33,10 +33,6 @@
  * @property float $invoicedHours
  * @property float $invoiceableHours
  * @property integer $orgOpenpsaAccesstype Shortcut for various ACL scenarios
- * @property integer $orgOpenpsaWgtype will contain bitmask as integer
-        - 00(int=0) not a workgroup
-        - 01(int=1) is workgroup but not active
-        - 11(int=3) active workgroup
  * @property string $orgOpenpsaOwnerWg The "owner" workgroup of this object
  * @package org.openpsa.sales
  */

diff --git a/schemas/org_openpsa_calendar.xml b/schemas/org_openpsa_calendar.xml
@@ -23,9 +23,6 @@
 
         <!-- Shortcut for various ACL scenarios -->
         <property name="orgOpenpsaAccesstype" type="integer"/>
-        <!-- will contain bitmask as integer, 00(int=0) not a workgroup, 01(int=1) is workgroup
-             but not active, 11(int=3) active workgroup -->
-        <property name="orgOpenpsaWgtype" type="integer"/>
         <!-- The "owner" workgroup of this object -->
         <property name="orgOpenpsaOwnerWg" type="string"/>
 

diff --git a/schemas/org_openpsa_contacts.xml b/schemas/org_openpsa_contacts.xml
@@ -46,9 +46,6 @@
         <property name="orgOpenpsaAccesstype" type="integer" />
         <!-- Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc) -->
         <property name="orgOpenpsaObtype" type="integer" />
-        <!-- will contain bitmask as integer, 00(int=0) not a workgroup, 01(int=1) is workgroup
-             but not active, 11(int=3) active workgroup -->
-        <property name="orgOpenpsaWgtype" type="integer" />
 
         <!-- /Common OpenPSA properties -->
     </type>
@@ -72,9 +69,6 @@
         <property name="orgOpenpsaAccesstype" type="integer" />
         <!-- Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc) -->
         <property name="orgOpenpsaObtype" type="integer" />
-        <!-- will contain bitmask as integer, 00(int=0) not a workgroup, 01(int=1) is workgroup
-             but not active, 11(int=3) active workgroup -->
-        <property name="orgOpenpsaWgtype" type="integer" />
 
         <!-- /Common OpenPSA properties -->
     </type>
@@ -109,9 +103,6 @@
 
         <!-- Shortcut for various ACL scenarios -->
         <property name="orgOpenpsaAccesstype" type="integer" />
-        <!-- will contain bitmask as integer, 00(int=0) not a workgroup, 01(int=1) is workgroup
-             but not active, 11(int=3) active workgroup -->
-        <property name="orgOpenpsaWgtype" type="integer" />
 
         <!-- /Common OpenPSA properties -->
     </type>

diff --git a/schemas/org_openpsa_directmarketing.xml b/schemas/org_openpsa_directmarketing.xml
@@ -14,9 +14,6 @@
         <property name="orgOpenpsaAccesstype" type="integer" />
         <!-- Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc) -->
         <property name="orgOpenpsaObtype" type="integer" />
-        <!-- will contain bitmask as integer, 00(int=0) not a workgroup, 01(int=1) is workgroup
-             but not active, 11(int=3) active workgroup -->
-        <property name="orgOpenpsaWgtype" type="integer" />
         <!-- The "owner" workgroup of this object -->
         <property name="orgOpenpsaOwnerWg" type="string" />
 

diff --git a/schemas/org_openpsa_documents.xml b/schemas/org_openpsa_documents.xml
@@ -30,15 +30,6 @@
         		Shortcut for various ACL scenarios
         	</description>
         </property>
-        <property name="orgOpenpsaWgtype" type="integer">
-        	<description>
-	            will contain bitmask as integer
-
-	            - 00(int=0) not a workgroup
-	            - 01(int=1) is workgroup but not active
-	            - 11(int=3) active workgroup   	
-        	</description>
-        </property>
         <property name="orgOpenpsaOwnerWg" type="string">
         	<description>
         		The "owner" workgroup of this object

diff --git a/schemas/org_openpsa_projects.xml b/schemas/org_openpsa_projects.xml
@@ -39,15 +39,6 @@
             Shortcut for various ACL scenarios
           </description>
         </property>
-        <property name="orgOpenpsaWgtype" type="integer">
-          <description>
-        will contain bitmask as integer
-
-        - 00(int=0) not a workgroup
-        - 01(int=1) is workgroup but not active
-        - 11(int=3) active workgroup
-          </description>
-        </property>
         <property name="orgOpenpsaOwnerWg" type="string">
           <description>
             The "owner" workgroup of this object
@@ -106,15 +97,6 @@
                 Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc)
             </description>
         </property>
-        <property name="orgOpenpsaWgtype" type="integer">
-            <description>
-                will contain bitmask as integer
-
-                - 00(int=0) not a workgroup
-                - 01(int=1) is workgroup but not active
-                - 11(int=3) active workgroup
-            </description>
-        </property>
         <property name="orgOpenpsaOwnerWg" type="string">
             <description>
                 The "owner" workgroup of this object

diff --git a/test/midcom/helper/__files/task.xml b/test/midcom/helper/__files/task.xml
@@ -21,7 +21,6 @@
     <title><![CDATA[Test entry *.* 1]]></title>
     <orgOpenpsaObtype>6002</orgOpenpsaObtype>
     <priority>3</priority>
-    <orgOpenpsaWgtype>0</orgOpenpsaWgtype>
     <status>6500</status>
     <invoicedHours>0</invoicedHours>
     <end>1305842399</end>

diff --git a/test/midcom/helper/exporter/xmlTest.php b/test/midcom/helper/exporter/xmlTest.php
@@ -113,7 +113,6 @@ private function _get_data_array()
             'title' => 'Test entry *.* 1',
             'orgOpenpsaObtype' => '6002',
             'priority' => '3',
-            'orgOpenpsaWgtype' => '',
             'status' => '6500',
             'invoicedHours' => '',
             'end' => '1305842399',

diff --git a/tools/migration_helpers/project_converter.php b/tools/migration_helpers/project_converter.php
@@ -262,7 +262,6 @@ private function _create_from_project()
             'invoicedHours' => 'invoicedHours',
             'invoiceableHours' => 'invoiceableHours',
             'orgOpenpsaAccesstype' => 'orgOpenpsaAccesstype',
-            'orgOpenpsaWgtype' => 'orgOpenpsaWgtype',
             'orgOpenpsaOwnerWg' => 'orgOpenpsaOwnerWg',
         ];
         foreach ($property_map as $source => $destination) {

diff --git a/tools/schemas_for_project_migration.xml b/tools/schemas_for_project_migration.xml
@@ -74,15 +74,6 @@
 	        	Used to a) distinguish OpenPSA objects in QB b) store object "subtype" (project vs task etc)
         	</description>
         </property>
-        <property name="orgOpenpsaWgtype" type="integer">
-        	<description>
-	            will contain bitmask as integer
-
-	            - 00(int=0) not a workgroup
-	            - 01(int=1) is workgroup but not active
-	            - 11(int=3) active workgroup
-        	</description>
-        </property>
         <property name="orgOpenpsaOwnerWg" type="string">
         	<description>
         		The "owner" workgroup of this object