r56108 - in /branches/14.2/projectmanager: ./ inc/class.datasource.inc.php

classic Classic list List threaded Threaded
1 message Options
nathangray nathangray
Reply | Threaded
Open this post in threaded view
|

r56108 - in /branches/14.2/projectmanager: ./ inc/class.datasource.inc.php

Author: nathangray
Date: Tue May 10 16:46:15 2016
New Revision: 56108

URL: http://svn.stylite.de/viewvc/egroupware?rev=56108&view=rev
Log:
Do not set missing real start/end from planned start/end

Modified:
    branches/14.2/projectmanager/   (props changed)
    branches/14.2/projectmanager/inc/class.datasource.inc.php

Propchange: branches/14.2/projectmanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 16:46:15 2016
@@ -1,1 +1,1 @@
-/trunk/projectmanager:51376,51411,51415,51449-51450,51473,51533-51534,51537,51581,51583,51591,51647,51652,51694,51718,51738,51740,51751,51791,51812,51817,51874-51875,51923,51925,51929,51948,52038,52100,52117,52360,52478,52751,53008,53359,53519,53523,53698,53704,53718,53748,54196,54446,54716,54736,54784,55704,55728,55768,55922
+/trunk/projectmanager:51376,51411,51415,51449-51450,51473,51533-51534,51537,51581,51583,51591,51647,51652,51694,51718,51738,51740,51751,51791,51812,51817,51874-51875,51923,51925,51929,51948,52038,52100,52117,52360,52478,52751,53008,53359,53519,53523,53698,53704,53718,53748,54196,54446,54716,54736,54784,55704,55728,55768,55922,56000

Modified: branches/14.2/projectmanager/inc/class.datasource.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/projectmanager/inc/class.datasource.inc.php?rev=56108&r1=56107&r2=56108&view=diff
==============================================================================
--- branches/14.2/projectmanager/inc/class.datasource.inc.php (original)
+++ branches/14.2/projectmanager/inc/class.datasource.inc.php Tue May 10 16:46:15 2016
@@ -255,11 +255,7 @@
  }
  }
  // setting real or planned start-date, from each other if not set
- if ((!isset($ds['pe_real_start']) || $ds['ignore_real_start']) && isset($ds['pe_planned_start']))
- {
- $ds['pe_real_start'] = $ds['pe_planned_start'];
- }
- elseif (!isset($ds['pe_planned_start']) && isset($ds['pe_real_start']))
+ if (!$ds['pe_planned_start'] && isset($ds['pe_real_start']))
  {
  $ds['pe_planned_start'] = $ds['pe_real_start'];
  }
@@ -282,11 +278,7 @@
  unset($ds['ignore_real_end']);
  }
  // setting real or planned end-date, from each other if not set
- if ((!isset($ds['pe_real_end']) || $ds['ignore_real_end']) && isset($ds['pe_planned_end']))
- {
- $ds['pe_real_end'] = $ds['pe_planned_end'];
- }
- elseif (!isset($ds['pe_planned_end']) && isset($ds['pe_real_end']))
+ if (!isset($ds['pe_planned_end']) && isset($ds['pe_real_end']))
  {
  $ds['pe_planned_end'] = $ds['pe_real_end'];
  }


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
eGroupWare-cvs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs