Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -45,57 +45,57 @@
 block discarded – undo
45 45
 
46 46
 class SugarWidgetSubPanelTopComposeEmailButton extends SugarWidgetSubPanelTopButton
47 47
 {
48
-	var $form_value = '';
48
+    var $form_value = '';
49 49
     
50 50
     public function getWidgetId($buttonSuffix = true)
51 51
     {
52
-    	global $app_strings;
53
-		$this->form_value = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_LABEL'];
54
-    	return parent::getWidgetId();
52
+        global $app_strings;
53
+        $this->form_value = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_LABEL'];
54
+        return parent::getWidgetId();
55 55
     }
56 56
 
57
-	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
58
-	{
59
-		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
60
-			$defines['module'] == "Activities" & !ACLController::checkAccess("Emails", 'edit', true))){
61
-			$temp = '';
62
-			return $temp;
63
-		}
57
+    function display($defines, $additionalFormFields = NULL, $nonbutton = false)
58
+    {
59
+        if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
60
+            $defines['module'] == "Activities" & !ACLController::checkAccess("Emails", 'edit', true))){
61
+            $temp = '';
62
+            return $temp;
63
+        }
64 64
 		
65
-		global $app_strings,$current_user,$sugar_config,$beanList,$beanFiles;
66
-		$title = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_TITLE'];
67
-		//$accesskey = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_KEY'];
68
-		$value = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_LABEL'];
69
-		$parent_type = $defines['focus']->module_dir;
70
-		$parent_id = $defines['focus']->id;
65
+        global $app_strings,$current_user,$sugar_config,$beanList,$beanFiles;
66
+        $title = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_TITLE'];
67
+        //$accesskey = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_KEY'];
68
+        $value = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_LABEL'];
69
+        $parent_type = $defines['focus']->module_dir;
70
+        $parent_id = $defines['focus']->id;
71 71
 
72
-		//martin Bug 19660
73
-		$userPref = $current_user->getPreference('email_link_type');
74
-		$defaultPref = $sugar_config['email_default_client'];
75
-		if($userPref != '') {
76
-			$client = $userPref;
77
-		} else {
78
-			$client = $defaultPref;
79
-		}
80
-		if($client != 'sugar') {
81
-			$bean = $defines['focus'];
82
-			// awu: Not all beans have emailAddress property, we must account for this
83
-			if (isset($bean->emailAddress)){
84
-				$to_addrs = $bean->emailAddress->getPrimaryAddress($bean);
85
-				$button = "<input class='button' type='button'  value='$value'  id='". $this->getWidgetId() . "'  name='".preg_replace('[ ]', '', $value)."'   title='$title' onclick=\"location.href='mailto:$to_addrs';return false;\" />";
86
-			}
87
-			else{
88
-				$button = "<input class='button' type='button'  value='$value'  id='". $this->getWidgetId() ."'  name='".preg_replace('[ ]', '', $value)."'  title='$title' onclick=\"location.href='mailto:';return false;\" />";
89
-			}
90
-		} else {
91
-			//Generate the compose package for the quick create options.
92
-    		$composeData = array("parent_id" => $parent_id, "parent_type"=>$parent_type);
72
+        //martin Bug 19660
73
+        $userPref = $current_user->getPreference('email_link_type');
74
+        $defaultPref = $sugar_config['email_default_client'];
75
+        if($userPref != '') {
76
+            $client = $userPref;
77
+        } else {
78
+            $client = $defaultPref;
79
+        }
80
+        if($client != 'sugar') {
81
+            $bean = $defines['focus'];
82
+            // awu: Not all beans have emailAddress property, we must account for this
83
+            if (isset($bean->emailAddress)){
84
+                $to_addrs = $bean->emailAddress->getPrimaryAddress($bean);
85
+                $button = "<input class='button' type='button'  value='$value'  id='". $this->getWidgetId() . "'  name='".preg_replace('[ ]', '', $value)."'   title='$title' onclick=\"location.href='mailto:$to_addrs';return false;\" />";
86
+            }
87
+            else{
88
+                $button = "<input class='button' type='button'  value='$value'  id='". $this->getWidgetId() ."'  name='".preg_replace('[ ]', '', $value)."'  title='$title' onclick=\"location.href='mailto:';return false;\" />";
89
+            }
90
+        } else {
91
+            //Generate the compose package for the quick create options.
92
+            $composeData = array("parent_id" => $parent_id, "parent_type"=>$parent_type);
93 93
             require_once('modules/Emails/EmailUI.php');
94 94
             $eUi = new EmailUI();
95 95
             $j_quickComposeOptions = $eUi->generateComposePackageForQuickCreate($composeData, http_build_query($composeData), false, $defines['focus']);
96 96
 
97 97
             $button = "<input title='$title'  id='". $this->getWidgetId()."'  onclick='SUGAR.quickCompose.init($j_quickComposeOptions);' class='button' type='submit' name='".preg_replace('[ ]', '', $value)."_button' value='$value' />";
98
-		}
99
-		return $button;
100
-	}
98
+        }
99
+        return $button;
100
+    }
101 101
 }
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopScheduleCallButton.php 1 patch
Indentation   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -45,120 +45,120 @@
 block discarded – undo
45 45
 
46 46
 class SugarWidgetSubPanelTopScheduleCallButton extends SugarWidgetSubPanelTopButtonQuickCreate
47 47
 {
48
-	function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
49
-	{
50
-		global $app_strings;
51
-		global $currentModule;
52
-
53
-		$this->module="Calls";
54
-		$this->subpanelDiv = "activities";
55
-
56
-		// Create the additional form fields with real values if they were not passed in
57
-		if(empty($additionalFormFields) && $this->additional_form_fields)
58
-		{
59
-			foreach($this->additional_form_fields as $key=>$value)
60
-			{
61
-				if(!empty($defines['focus']->$value))
62
-				{
63
-					$additionalFormFields[$key] = $defines['focus']->$value;
64
-				}
65
-				else
66
-				{
67
-					$additionalFormFields[$key] = '';
68
-				}
69
-			}
70
-		}
71
-
72
-		if(!empty($this->module))
73
-		{
74
-			$defines['child_module_name'] = $this->module;
75
-		}
76
-		else
77
-		{
78
-			$defines['child_module_name'] = $defines['module'];
79
-		}
80
-
81
-		if(!empty($this->subpanelDiv))
82
-		{
83
-			$defines['subpanelDiv'] = $this->subpanelDiv;
84
-		}
85
-
86
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
87
-
88
-		$form = 'form' . $defines['child_module_name'];
89
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
90
-
91
-		//module_button is used to override the value of module name
92
-		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
93
-		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
94
-
95
-		if(isset($defines['focus']->name))
96
-		{
97
-			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
98
-		}
99
-
100
-		$button .= '<input type="hidden" name="to_pdf" value="true" />';
48
+    function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
49
+    {
50
+        global $app_strings;
51
+        global $currentModule;
52
+
53
+        $this->module="Calls";
54
+        $this->subpanelDiv = "activities";
55
+
56
+        // Create the additional form fields with real values if they were not passed in
57
+        if(empty($additionalFormFields) && $this->additional_form_fields)
58
+        {
59
+            foreach($this->additional_form_fields as $key=>$value)
60
+            {
61
+                if(!empty($defines['focus']->$value))
62
+                {
63
+                    $additionalFormFields[$key] = $defines['focus']->$value;
64
+                }
65
+                else
66
+                {
67
+                    $additionalFormFields[$key] = '';
68
+                }
69
+            }
70
+        }
71
+
72
+        if(!empty($this->module))
73
+        {
74
+            $defines['child_module_name'] = $this->module;
75
+        }
76
+        else
77
+        {
78
+            $defines['child_module_name'] = $defines['module'];
79
+        }
80
+
81
+        if(!empty($this->subpanelDiv))
82
+        {
83
+            $defines['subpanelDiv'] = $this->subpanelDiv;
84
+        }
85
+
86
+        $defines['parent_bean_name'] = get_class( $defines['focus']);
87
+
88
+        $form = 'form' . $defines['child_module_name'];
89
+        $button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
90
+
91
+        //module_button is used to override the value of module name
92
+        $button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
93
+        $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
94
+
95
+        if(isset($defines['focus']->name))
96
+        {
97
+            $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
98
+        }
99
+
100
+        $button .= '<input type="hidden" name="to_pdf" value="true" />';
101 101
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
102
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
103
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
104
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
105
-		$button .= '<input type="hidden" name="record" value="" />';
106
-
107
-		// TODO: move this out and get $additionalFormFields working properly
108
-		if(empty($additionalFormFields['parent_type']))
109
-		{
110
-			if($defines['focus']->object_name=='Contact') {
111
-				$additionalFormFields['parent_type'] = 'Accounts';
112
-			}
113
-			else {
114
-				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
115
-			}
116
-		}
117
-		if(empty($additionalFormFields['parent_name']))
118
-		{
119
-			if($defines['focus']->object_name=='Contact') {
120
-				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
121
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
122
-			}
123
-			else {
124
-				$additionalFormFields['parent_name'] = $defines['focus']->name;
125
-			}
126
-		}
127
-		if(empty($additionalFormFields['parent_id']))
128
-		{
129
-			if($defines['focus']->object_name=='Contact') {
130
-				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
131
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
132
-			}
133
-			else {
134
-				$additionalFormFields['parent_id'] = $defines['focus']->id;
135
-			}
136
-		}
137
-
138
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
139
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
140
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
141
-
142
-		// fill in additional form fields for all but action
143
-		foreach($additionalFormFields as $key => $value)
144
-		{
145
-			if($key != 'action')
146
-			{
147
-				$button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
148
-			}
149
-		}
150
-		$button .= getVersionedScript('include/SugarFields/Fields/Datetimecombo/Datetimecombo.js')."\n";
151
-		return $button;
152
-	}
153
-
154
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
155
-	{
156
-	    $focus = new Call;
157
-		if ( !$focus->ACLAccess('EditView') ) {
158
-		    return '';
159
-	    }
160
-
161
-		return parent::display($defines, $additionalFormFields);
162
-	}
102
+        $button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
103
+        $button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
104
+        $button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
105
+        $button .= '<input type="hidden" name="record" value="" />';
106
+
107
+        // TODO: move this out and get $additionalFormFields working properly
108
+        if(empty($additionalFormFields['parent_type']))
109
+        {
110
+            if($defines['focus']->object_name=='Contact') {
111
+                $additionalFormFields['parent_type'] = 'Accounts';
112
+            }
113
+            else {
114
+                $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
115
+            }
116
+        }
117
+        if(empty($additionalFormFields['parent_name']))
118
+        {
119
+            if($defines['focus']->object_name=='Contact') {
120
+                $additionalFormFields['parent_name'] = $defines['focus']->account_name;
121
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
122
+            }
123
+            else {
124
+                $additionalFormFields['parent_name'] = $defines['focus']->name;
125
+            }
126
+        }
127
+        if(empty($additionalFormFields['parent_id']))
128
+        {
129
+            if($defines['focus']->object_name=='Contact') {
130
+                $additionalFormFields['parent_id'] = $defines['focus']->account_id;
131
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
132
+            }
133
+            else {
134
+                $additionalFormFields['parent_id'] = $defines['focus']->id;
135
+            }
136
+        }
137
+
138
+        $button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
139
+        $button .= '<input type="hidden" name="module" value="Home" />' . "\n";
140
+        $button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
141
+
142
+        // fill in additional form fields for all but action
143
+        foreach($additionalFormFields as $key => $value)
144
+        {
145
+            if($key != 'action')
146
+            {
147
+                $button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
148
+            }
149
+        }
150
+        $button .= getVersionedScript('include/SugarFields/Fields/Datetimecombo/Datetimecombo.js')."\n";
151
+        return $button;
152
+    }
153
+
154
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
155
+    {
156
+        $focus = new Call;
157
+        if ( !$focus->ACLAccess('EditView') ) {
158
+            return '';
159
+        }
160
+
161
+        return parent::display($defines, $additionalFormFields);
162
+    }
163 163
 }
164 164
 ?>
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopButtonQuickCreate.php 1 patch
Indentation   +128 added lines, -128 removed lines patch added patch discarded remove patch
@@ -47,103 +47,103 @@  discard block
 block discarded – undo
47 47
 {
48 48
 
49 49
 
50
-	function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
51
-	{
52
-		global $app_strings;
53
-		global $currentModule;
54
-
55
-		// Create the additional form fields with real values if they were not passed in
56
-		if(empty($additionalFormFields) && $this->additional_form_fields)
57
-		{
58
-			foreach($this->additional_form_fields as $key=>$value)
59
-			{
60
-				if(!empty($defines['focus']->$value))
61
-				{
62
-					$additionalFormFields[$key] = $defines['focus']->$value;
63
-				}
64
-				else
65
-				{
66
-					$additionalFormFields[$key] = '';
67
-				}
68
-			}
69
-		}
70
-
71
-		if(!empty($this->module))
72
-		{
73
-			$defines['child_module_name'] = $this->module;
74
-		}
75
-		else
76
-		{
77
-			$defines['child_module_name'] = $defines['module'];
78
-		}
79
-
80
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
81
-
82
-		$relationship_name = $this->get_subpanel_relationship_name($defines);
83
-
84
-		$form = 'form' . $relationship_name;
85
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . $defines['subpanel_definition']->name . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
86
-
87
-		//module_button is used to override the value of module name
88
-		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
89
-		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
90
-
91
-		if(isset($defines['focus']->name))
92
-		{
93
-			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
94
-			#26451,add these fields for custom one-to-many relate field.
50
+    function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
51
+    {
52
+        global $app_strings;
53
+        global $currentModule;
54
+
55
+        // Create the additional form fields with real values if they were not passed in
56
+        if(empty($additionalFormFields) && $this->additional_form_fields)
57
+        {
58
+            foreach($this->additional_form_fields as $key=>$value)
59
+            {
60
+                if(!empty($defines['focus']->$value))
61
+                {
62
+                    $additionalFormFields[$key] = $defines['focus']->$value;
63
+                }
64
+                else
65
+                {
66
+                    $additionalFormFields[$key] = '';
67
+                }
68
+            }
69
+        }
70
+
71
+        if(!empty($this->module))
72
+        {
73
+            $defines['child_module_name'] = $this->module;
74
+        }
75
+        else
76
+        {
77
+            $defines['child_module_name'] = $defines['module'];
78
+        }
79
+
80
+        $defines['parent_bean_name'] = get_class( $defines['focus']);
81
+
82
+        $relationship_name = $this->get_subpanel_relationship_name($defines);
83
+
84
+        $form = 'form' . $relationship_name;
85
+        $button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . $defines['subpanel_definition']->name . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
86
+
87
+        //module_button is used to override the value of module name
88
+        $button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
89
+        $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
90
+
91
+        if(isset($defines['focus']->name))
92
+        {
93
+            $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
94
+            #26451,add these fields for custom one-to-many relate field.
95 95
             if(!empty($defines['child_module_name'])){
96
-            	$button .= "<input type='hidden' name='". $relationship_name ."_name' value='".$defines['focus']->name."'>";
97
-            	$childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
98
-            	if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
99
-            		$button .= "<input type='hidden' name='". $GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'] ."' value='".$defines['focus']->id."'>";
100
-            	}
96
+                $button .= "<input type='hidden' name='". $relationship_name ."_name' value='".$defines['focus']->name."'>";
97
+                $childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
98
+                if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
99
+                    $button .= "<input type='hidden' name='". $GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'] ."' value='".$defines['focus']->id."'>";
100
+                }
101 101
             }
102 102
             
103 103
             //Set the return_name form variable that will allow EditView2.php 
104 104
             $additionalFormFields['return_name'] = $defines['focus']->name;
105
-		}
105
+        }
106 106
 		
107
-		if(!empty($defines['view']))
108
-		$button .= '<input type="hidden" name="target_view" value="'. $defines['view'] . '" />';
109
-		$button .= '<input type="hidden" name="to_pdf" value="true" />';
107
+        if(!empty($defines['view']))
108
+        $button .= '<input type="hidden" name="target_view" value="'. $defines['view'] . '" />';
109
+        $button .= '<input type="hidden" name="to_pdf" value="true" />';
110 110
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
111
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
112
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
113
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
114
-		$button .= '<input type="hidden" name="return_relationship" value="' . $relationship_name . "\" />\n";
115
-		$button .= '<input type="hidden" name="record" value="" />';
116
-
117
-		// TODO: move this out and get $additionalFormFields working properly
118
-		if(empty($additionalFormFields['parent_type']))
119
-		{
120
-			if($defines['focus']->object_name=='Contact') {
121
-				$additionalFormFields['parent_type'] = 'Accounts';
122
-			}
123
-			else {
124
-				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
125
-			}
126
-		}
127
-		if(empty($additionalFormFields['parent_name']))
128
-		{
129
-			if($defines['focus']->object_name=='Contact') {
130
-				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
131
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
132
-			}
133
-			else {
134
-				$additionalFormFields['parent_name'] = $defines['focus']->name;
135
-			}
136
-		}
137
-		if(empty($additionalFormFields['parent_id']))
138
-		{
139
-			if($defines['focus']->object_name=='Contact') {
140
-				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
141
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
142
-			}
143
-			else {
144
-				$additionalFormFields['parent_id'] = $defines['focus']->id;
145
-			}
146
-		}
111
+        $button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
112
+        $button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
113
+        $button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
114
+        $button .= '<input type="hidden" name="return_relationship" value="' . $relationship_name . "\" />\n";
115
+        $button .= '<input type="hidden" name="record" value="" />';
116
+
117
+        // TODO: move this out and get $additionalFormFields working properly
118
+        if(empty($additionalFormFields['parent_type']))
119
+        {
120
+            if($defines['focus']->object_name=='Contact') {
121
+                $additionalFormFields['parent_type'] = 'Accounts';
122
+            }
123
+            else {
124
+                $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
125
+            }
126
+        }
127
+        if(empty($additionalFormFields['parent_name']))
128
+        {
129
+            if($defines['focus']->object_name=='Contact') {
130
+                $additionalFormFields['parent_name'] = $defines['focus']->account_name;
131
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
132
+            }
133
+            else {
134
+                $additionalFormFields['parent_name'] = $defines['focus']->name;
135
+            }
136
+        }
137
+        if(empty($additionalFormFields['parent_id']))
138
+        {
139
+            if($defines['focus']->object_name=='Contact') {
140
+                $additionalFormFields['parent_id'] = $defines['focus']->account_id;
141
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
142
+            }
143
+            else {
144
+                $additionalFormFields['parent_id'] = $defines['focus']->id;
145
+            }
146
+        }
147 147
 
148 148
         if(strtolower($defines['child_module_name']) =='contracts') {
149 149
             //set variables to account name, or parent account name
@@ -161,43 +161,43 @@  discard block
 block discarded – undo
161 161
             }
162 162
         }
163 163
 
164
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
165
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
166
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
167
-
168
-		// fill in additional form fields for all but action
169
-		foreach($additionalFormFields as $key => $value)
170
-		{
171
-			if($key != 'action')
172
-			{
173
-				$button .= '<input type="hidden" name="' . $key . '" value=\'' . $value . '\' />' . "\n";
174
-			}
175
-		}
176
-
177
-		return $button;
178
-	}
179
-
180
-	/**
181
-	 * get_subpanel_relationship_name
182
-	 * Get the relationship name based on the subapnel definition
183
-	 * @param mixed $defines The subpanel definition
184
-	 */
185
-	function get_subpanel_relationship_name($defines) {
186
-		 $relationship_name = '';
187
-		 if(!empty($defines)) {
188
-		 	$relationship_name = isset($defines['module']) ? $defines['module'] : '';
189
-	     	$dataSource = $defines['subpanel_definition']->get_data_source_name(true);
190
-         	if (!empty($dataSource)) {
191
-				$relationship_name = $dataSource;
192
-				//Try to set the relationship name to the real relationship, not the link.
193
-				if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
194
-				 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
195
-				{
196
-					$relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
197
-				}
198
-			}
199
-		 }
200
-		 return $relationship_name;
201
-	}
164
+        $button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
165
+        $button .= '<input type="hidden" name="module" value="Home" />' . "\n";
166
+        $button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
167
+
168
+        // fill in additional form fields for all but action
169
+        foreach($additionalFormFields as $key => $value)
170
+        {
171
+            if($key != 'action')
172
+            {
173
+                $button .= '<input type="hidden" name="' . $key . '" value=\'' . $value . '\' />' . "\n";
174
+            }
175
+        }
176
+
177
+        return $button;
178
+    }
179
+
180
+    /**
181
+     * get_subpanel_relationship_name
182
+     * Get the relationship name based on the subapnel definition
183
+     * @param mixed $defines The subpanel definition
184
+     */
185
+    function get_subpanel_relationship_name($defines) {
186
+            $relationship_name = '';
187
+            if(!empty($defines)) {
188
+                $relationship_name = isset($defines['module']) ? $defines['module'] : '';
189
+                $dataSource = $defines['subpanel_definition']->get_data_source_name(true);
190
+                if (!empty($dataSource)) {
191
+                $relationship_name = $dataSource;
192
+                //Try to set the relationship name to the real relationship, not the link.
193
+                if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
194
+                 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
195
+                {
196
+                    $relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
197
+                }
198
+            }
199
+            }
200
+            return $relationship_name;
201
+    }
202 202
 }
203 203
 ?>
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFieldint.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -42,59 +42,59 @@
 block discarded – undo
42 42
 
43 43
 class SugarWidgetFieldInt extends SugarWidgetReportField
44 44
 {
45
- function displayList($layout_def)
46
- {
45
+    function displayList($layout_def)
46
+    {
47 47
 
48
- 	return $this->displayListPlain($layout_def);
49
- }
48
+        return $this->displayListPlain($layout_def);
49
+    }
50 50
 
51
- function queryFilterEquals(&$layout_def)
52
- {
51
+    function queryFilterEquals(&$layout_def)
52
+    {
53 53
                 return $this->_get_column_select($layout_def)."= '".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
54
- }
54
+    }
55 55
 
56
- function queryFilterNot_Equals(&$layout_def)
57
- {
56
+    function queryFilterNot_Equals(&$layout_def)
57
+    {
58 58
                 return $this->_get_column_select($layout_def)."!='".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
59
- }
59
+    }
60 60
 
61
- function queryFilterGreater(&$layout_def)
62
- {
61
+    function queryFilterGreater(&$layout_def)
62
+    {
63 63
                 return $this->_get_column_select($layout_def)." > '".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
64
- }
64
+    }
65 65
 
66
- function queryFilterLess(&$layout_def)
67
- {
66
+    function queryFilterLess(&$layout_def)
67
+    {
68 68
                 return $this->_get_column_select($layout_def)." < '".$GLOBALS['db']->quote($layout_def['input_name0'])."'\n";
69
- }
69
+    }
70 70
 
71
- function queryFilterBetween(&$layout_def)
72
- {
73
- 	             return $this->_get_column_select($layout_def)." BETWEEN '".$GLOBALS['db']->quote($layout_def['input_name0']). "' AND '" . $GLOBALS['db']->quote($layout_def['input_name1']) . "'\n";
74
- }
71
+    function queryFilterBetween(&$layout_def)
72
+    {
73
+                    return $this->_get_column_select($layout_def)." BETWEEN '".$GLOBALS['db']->quote($layout_def['input_name0']). "' AND '" . $GLOBALS['db']->quote($layout_def['input_name1']) . "'\n";
74
+    }
75 75
 
76
- function queryFilterStarts_With(&$layout_def)
77
- {
78
- 	return $this->queryFilterEquals($layout_def);
79
- }
76
+    function queryFilterStarts_With(&$layout_def)
77
+    {
78
+        return $this->queryFilterEquals($layout_def);
79
+    }
80 80
 
81
- function displayInput(&$layout_def)
82
- {
83
- 	 return '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
81
+    function displayInput(&$layout_def)
82
+    {
83
+        return '<input type="text" size="20" value="' . $layout_def['input_name0'] . '" name="' . $layout_def['name'] . '">';
84 84
 
85
- }
85
+    }
86 86
  
87
- function display($layout_def)
88
- {
89
-	   //Bug40995
90
-	   if(isset($obj->layout_manager->defs['reporter']->focus->field_name_map[$layout_def['name']]['precision']))
91
-	   {
92
-		   $precision=$obj->layout_manager->defs['reporter']->focus->field_name_map[$layout_def['name']]['precision'];
93
-		   $layout_def['precision']=$precision;
94
-	   }
95
-	   //Bug40995
96
-       return parent::display($layout_def);
97
- } 
87
+    function display($layout_def)
88
+    {
89
+        //Bug40995
90
+        if(isset($obj->layout_manager->defs['reporter']->focus->field_name_map[$layout_def['name']]['precision']))
91
+        {
92
+            $precision=$obj->layout_manager->defs['reporter']->focus->field_name_map[$layout_def['name']]['precision'];
93
+            $layout_def['precision']=$precision;
94
+        }
95
+        //Bug40995
96
+        return parent::display($layout_def);
97
+    } 
98 98
 
99 99
 }
100 100
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopSummaryButton.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -45,38 +45,38 @@
 block discarded – undo
45 45
 
46 46
 class SugarWidgetSubPanelTopSummaryButton extends SugarWidgetSubPanelTopButton
47 47
 {
48
-	function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
49
-	{
48
+    function display($widget_data, $additionalFormFields = NULL, $nonbutton = false)
49
+    {
50 50
 		
51 51
 		
52
-		global $app_strings;
53
-		global $currentModule;
52
+        global $app_strings;
53
+        global $currentModule;
54 54
 
55
-		$popup_request_data = array(
56
-			'call_back_function' => 'set_return',
57
-			'form_name' => 'EditView',
58
-			'field_to_name_array' => array(),
59
-		);
55
+        $popup_request_data = array(
56
+            'call_back_function' => 'set_return',
57
+            'form_name' => 'EditView',
58
+            'field_to_name_array' => array(),
59
+        );
60 60
 
61
-		$json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
62
-		$title = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_TITLE'];
63
-		//$accesskey = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_KEY'];
64
-		$value = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_LABEL'];
65
-		$module_name = 'Activities';
66
-		$id = $widget_data['focus']->id;
67
-		$initial_filter = "&record=$id&module_name=$currentModule";
68
-		if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'detail', true)){
69
-			$temp =  '<input disabled type="button" name="summary_button" id="summary_button"'
70
-			. ' class="button"'
71
-			. ' title="' . $title . '"'
72
-			. ' value="' . $value . '"';
73
-			return $temp;
74
-		}
75
-		return '<input type="button" name="summary_button" id="summary_button"'
76
-			. ' class="button"'
77
-			. ' title="' . $title . '"'
78
-			. ' value="' . $value . '"'
79
-			. " onclick='open_popup(\"$module_name\",600,400,\"$initial_filter\",false,false,$json_encoded_php_array);' />\n";
80
-	}
61
+        $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
62
+        $title = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_TITLE'];
63
+        //$accesskey = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_KEY'];
64
+        $value = $app_strings['LBL_ACCUMULATED_HISTORY_BUTTON_LABEL'];
65
+        $module_name = 'Activities';
66
+        $id = $widget_data['focus']->id;
67
+        $initial_filter = "&record=$id&module_name=$currentModule";
68
+        if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'detail', true)){
69
+            $temp =  '<input disabled type="button" name="summary_button" id="summary_button"'
70
+            . ' class="button"'
71
+            . ' title="' . $title . '"'
72
+            . ' value="' . $value . '"';
73
+            return $temp;
74
+        }
75
+        return '<input type="button" name="summary_button" id="summary_button"'
76
+            . ' class="button"'
77
+            . ' title="' . $title . '"'
78
+            . ' value="' . $value . '"'
79
+            . " onclick='open_popup(\"$module_name\",600,400,\"$initial_filter\",false,false,$json_encoded_php_array);' />\n";
80
+    }
81 81
 }
82 82
 ?>
83 83
\ No newline at end of file
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetFielddatepicker.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 
44 44
 class SugarWidgetFieldDatePicker extends SugarWidgetFieldDateTime
45 45
 {
46
-	function displayInput($layout_def)
46
+    function displayInput($layout_def)
47 47
     {
48 48
         global $timedate;
49 49
 
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelEmailLink.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -45,62 +45,62 @@  discard block
 block discarded – undo
45 45
 
46 46
 class SugarWidgetSubPanelEmailLink extends SugarWidgetField {
47 47
 
48
-	function displayList($layout_def) {
49
-		global $current_user;
50
-		global $beanList;
51
-		global $focus;
52
-		global $sugar_config;
53
-		global $locale;
54
-
55
-		if(isset($layout_def['varname'])) {
56
-			$key = strtoupper($layout_def['varname']);
57
-		} else {
58
-			$key = $this->_get_column_alias($layout_def);
59
-			$key = strtoupper($key);
60
-		}
61
-		$value = $layout_def['fields'][$key];
62
-
63
-
64
-
65
-			if(isset($_REQUEST['action'])) $action = $_REQUEST['action'];
66
-			else $action = '';
67
-
68
-			if(isset($_REQUEST['module'])) $module = $_REQUEST['module'];
69
-			else $module = '';
70
-
71
-			if(isset($_REQUEST['record'])) $record = $_REQUEST['record'];
72
-			else $record = '';
73
-
74
-			if (!empty($focus->name)) {
75
-				$name = $focus->name;
76
-			} else {
77
-				if( !empty($focus->first_name) && !empty($focus->last_name)) {
78
-					$name = $locale->getLocaleFormattedName($focus->first_name, $focus->last_name);
79
-					}
80
-				if(empty($name)) {
81
-					$name = '*';
82
-				}
83
-			}
84
-
85
-			$userPref = $current_user->getPreference('email_link_type');
86
-			$defaultPref = $sugar_config['email_default_client'];
87
-			if($userPref != '') {
88
-				$client = $userPref;
89
-			} else {
90
-				$client = $defaultPref;
91
-			}
92
-
93
-			if($client == 'sugar')
94
-			{
95
-			    $composeData = array(
96
-			        'load_id' => $layout_def['fields']['ID'],
48
+    function displayList($layout_def) {
49
+        global $current_user;
50
+        global $beanList;
51
+        global $focus;
52
+        global $sugar_config;
53
+        global $locale;
54
+
55
+        if(isset($layout_def['varname'])) {
56
+            $key = strtoupper($layout_def['varname']);
57
+        } else {
58
+            $key = $this->_get_column_alias($layout_def);
59
+            $key = strtoupper($key);
60
+        }
61
+        $value = $layout_def['fields'][$key];
62
+
63
+
64
+
65
+            if(isset($_REQUEST['action'])) $action = $_REQUEST['action'];
66
+            else $action = '';
67
+
68
+            if(isset($_REQUEST['module'])) $module = $_REQUEST['module'];
69
+            else $module = '';
70
+
71
+            if(isset($_REQUEST['record'])) $record = $_REQUEST['record'];
72
+            else $record = '';
73
+
74
+            if (!empty($focus->name)) {
75
+                $name = $focus->name;
76
+            } else {
77
+                if( !empty($focus->first_name) && !empty($focus->last_name)) {
78
+                    $name = $locale->getLocaleFormattedName($focus->first_name, $focus->last_name);
79
+                    }
80
+                if(empty($name)) {
81
+                    $name = '*';
82
+                }
83
+            }
84
+
85
+            $userPref = $current_user->getPreference('email_link_type');
86
+            $defaultPref = $sugar_config['email_default_client'];
87
+            if($userPref != '') {
88
+                $client = $userPref;
89
+            } else {
90
+                $client = $defaultPref;
91
+            }
92
+
93
+            if($client == 'sugar')
94
+            {
95
+                $composeData = array(
96
+                    'load_id' => $layout_def['fields']['ID'],
97 97
                     'load_module' => $this->layout_manager->defs['module_name'],
98 98
                     'parent_type' => $this->layout_manager->defs['module_name'],
99 99
                     'parent_id' => $layout_def['fields']['ID'],
100
-			        'return_module' => $module,
101
-			        'return_action' => $action,
102
-			        'return_id' => $record
103
-			    );
100
+                    'return_module' => $module,
101
+                    'return_action' => $action,
102
+                    'return_id' => $record
103
+                );
104 104
                 if(isset($layout_def['fields']['FULL_NAME'])){
105 105
                     $composeData['parent_name'] = $layout_def['fields']['FULL_NAME'];
106 106
                     $composeData['to_email_addrs'] = sprintf("%s <%s>", $layout_def['fields']['FULL_NAME'], $layout_def['fields']['EMAIL1']);
@@ -112,11 +112,11 @@  discard block
 block discarded – undo
112 112
                 $j_quickComposeOptions = $eUi->generateComposePackageForQuickCreate($composeData, http_build_query($composeData), true);
113 113
 
114 114
                 $link = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init($j_quickComposeOptions);'>";
115
-			} else {
116
-				$link = '<a href="mailto:' . $value .'" >';
117
-			}
115
+            } else {
116
+                $link = '<a href="mailto:' . $value .'" >';
117
+            }
118 118
 
119
-			return $link.$value.'</a>';
119
+            return $link.$value.'</a>';
120 120
 
121
-	}
121
+    }
122 122
 } // end class def
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateTaskButton.php 1 patch
Indentation   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -45,121 +45,121 @@
 block discarded – undo
45 45
 
46 46
 class SugarWidgetSubPanelTopCreateTaskButton extends SugarWidgetSubPanelTopButtonQuickCreate
47 47
 {
48
-	function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
49
-	{
50
-		global $app_strings;
51
-		global $currentModule;
52
-
53
-		$this->module="Tasks";
54
-		$this->subpanelDiv = "activities";
55
-
56
-		// Create the additional form fields with real values if they were not passed in
57
-		if(empty($additionalFormFields) && $this->additional_form_fields)
58
-		{
59
-			foreach($this->additional_form_fields as $key=>$value)
60
-			{
61
-				if(!empty($defines['focus']->$value))
62
-				{
63
-					$additionalFormFields[$key] = $defines['focus']->$value;
64
-				}
65
-				else
66
-				{
67
-					$additionalFormFields[$key] = '';
68
-				}
69
-			}
70
-		}
71
-
72
-		if(!empty($this->module))
73
-		{
74
-			$defines['child_module_name'] = $this->module;
75
-		}
76
-		else
77
-		{
78
-			$defines['child_module_name'] = $defines['module'];
79
-		}
80
-
81
-		if(empty($defines['subpanelDiv']))
82
-		{
83
-			$defines['subpanelDiv'] = $this->subpanelDiv;
84
-		}
85
-
86
-		$defines['parent_bean_name'] = get_class( $defines['focus']);
87
-
88
-		$form = 'form' . $defines['child_module_name'];
89
-		$button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
90
-
91
-		//module_button is used to override the value of module name
92
-		$button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
93
-		$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
94
-
95
-		if(isset($defines['focus']->name))
96
-		{
97
-			$button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
98
-		}
99
-
100
-		$button .= '<input type="hidden" name="to_pdf" value="true" />';
48
+    function &_get_form($defines, $additionalFormFields = null, $asUrl = false)
49
+    {
50
+        global $app_strings;
51
+        global $currentModule;
52
+
53
+        $this->module="Tasks";
54
+        $this->subpanelDiv = "activities";
55
+
56
+        // Create the additional form fields with real values if they were not passed in
57
+        if(empty($additionalFormFields) && $this->additional_form_fields)
58
+        {
59
+            foreach($this->additional_form_fields as $key=>$value)
60
+            {
61
+                if(!empty($defines['focus']->$value))
62
+                {
63
+                    $additionalFormFields[$key] = $defines['focus']->$value;
64
+                }
65
+                else
66
+                {
67
+                    $additionalFormFields[$key] = '';
68
+                }
69
+            }
70
+        }
71
+
72
+        if(!empty($this->module))
73
+        {
74
+            $defines['child_module_name'] = $this->module;
75
+        }
76
+        else
77
+        {
78
+            $defines['child_module_name'] = $defines['module'];
79
+        }
80
+
81
+        if(empty($defines['subpanelDiv']))
82
+        {
83
+            $defines['subpanelDiv'] = $this->subpanelDiv;
84
+        }
85
+
86
+        $defines['parent_bean_name'] = get_class( $defines['focus']);
87
+
88
+        $form = 'form' . $defines['child_module_name'];
89
+        $button = '<form onsubmit="return SUGAR.subpanelUtils.sendAndRetrieve(this.id, \'subpanel_' . strtolower($defines['subpanelDiv']) . '\', \'' . addslashes($app_strings['LBL_LOADING']) . '\');" action="index.php" method="post" name="form" id="form' . $form . "\">\n";
90
+
91
+        //module_button is used to override the value of module name
92
+        $button .= "<input type='hidden' name='target_module' value='".$defines['child_module_name']."'>\n";
93
+        $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_id' value='".$defines['focus']->id."'>\n";
94
+
95
+        if(isset($defines['focus']->name))
96
+        {
97
+            $button .= "<input type='hidden' name='".strtolower($defines['parent_bean_name'])."_name' value='".$defines['focus']->name."'>";
98
+        }
99
+
100
+        $button .= '<input type="hidden" name="to_pdf" value="true" />';
101 101
         $button .= '<input type="hidden" name="tpl" value="QuickCreate.tpl" />';
102
-		$button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
103
-		$button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
104
-		$button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
105
-		$button .= '<input type="hidden" name="record" value="" />';
106
-
107
-		// TODO: move this out and get $additionalFormFields working properly
108
-		if(empty($additionalFormFields['parent_type']))
109
-		{
110
-			if($defines['focus']->object_name=='Contact') {
111
-				$additionalFormFields['parent_type'] = 'Accounts';
112
-			}
113
-			else {
114
-				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
115
-			}
116
-		}
117
-		if(empty($additionalFormFields['parent_name']))
118
-		{
119
-			if($defines['focus']->object_name=='Contact') {
120
-				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
121
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
122
-			}
123
-			else {
124
-				$additionalFormFields['parent_name'] = $defines['focus']->name;
125
-			}
126
-		}
127
-		if(empty($additionalFormFields['parent_id']))
128
-		{
129
-			if($defines['focus']->object_name=='Contact') {
130
-				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
131
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
132
-			}
133
-			else {
134
-				$additionalFormFields['parent_id'] = $defines['focus']->id;
135
-			}
136
-		}
137
-
138
-		$button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
139
-		$button .= '<input type="hidden" name="module" value="Home" />' . "\n";
140
-		$button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
141
-
142
-		// fill in additional form fields for all but action
143
-		foreach($additionalFormFields as $key => $value)
144
-		{
145
-			if($key != 'action')
146
-			{
147
-				$button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
148
-			}
149
-		}
150
-
151
-		return $button;
152
-	}
153
-
154
-
155
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
156
-	{
157
-	    $focus = new Task;
158
-		if ( !$focus->ACLAccess('EditView') ) {
159
-		    return '';
160
-	    }
102
+        $button .= '<input type="hidden" name="return_module" value="' . $currentModule . "\" />\n";
103
+        $button .= '<input type="hidden" name="return_action" value="' . $defines['action'] . "\" />\n";
104
+        $button .= '<input type="hidden" name="return_id" value="' . $defines['focus']->id . "\" />\n";
105
+        $button .= '<input type="hidden" name="record" value="" />';
106
+
107
+        // TODO: move this out and get $additionalFormFields working properly
108
+        if(empty($additionalFormFields['parent_type']))
109
+        {
110
+            if($defines['focus']->object_name=='Contact') {
111
+                $additionalFormFields['parent_type'] = 'Accounts';
112
+            }
113
+            else {
114
+                $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
115
+            }
116
+        }
117
+        if(empty($additionalFormFields['parent_name']))
118
+        {
119
+            if($defines['focus']->object_name=='Contact') {
120
+                $additionalFormFields['parent_name'] = $defines['focus']->account_name;
121
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
122
+            }
123
+            else {
124
+                $additionalFormFields['parent_name'] = $defines['focus']->name;
125
+            }
126
+        }
127
+        if(empty($additionalFormFields['parent_id']))
128
+        {
129
+            if($defines['focus']->object_name=='Contact') {
130
+                $additionalFormFields['parent_id'] = $defines['focus']->account_id;
131
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
132
+            }
133
+            else {
134
+                $additionalFormFields['parent_id'] = $defines['focus']->id;
135
+            }
136
+        }
137
+
138
+        $button .= '<input type="hidden" name="action" value="SubpanelCreates" />' . "\n";
139
+        $button .= '<input type="hidden" name="module" value="Home" />' . "\n";
140
+        $button .= '<input type="hidden" name="target_action" value="QuickCreate" />' . "\n";
141
+
142
+        // fill in additional form fields for all but action
143
+        foreach($additionalFormFields as $key => $value)
144
+        {
145
+            if($key != 'action')
146
+            {
147
+                $button .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
148
+            }
149
+        }
150
+
151
+        return $button;
152
+    }
153
+
154
+
155
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
156
+    {
157
+        $focus = new Task;
158
+        if ( !$focus->ACLAccess('EditView') ) {
159
+            return '';
160
+        }
161 161
 		
162
-		return parent::display($defines, $additionalFormFields);
163
-	}
162
+        return parent::display($defines, $additionalFormFields);
163
+    }
164 164
 }
165 165
 ?>
Please login to merge, or discard this patch.
include/generic/SugarWidgets/SugarWidgetSubPanelEditButton.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,16 +48,16 @@
 block discarded – undo
48 48
     protected static $defs = array();
49 49
     protected static $edit_icon_html;
50 50
 
51
-	function displayHeaderCell($layout_def)
52
-	{
53
-		return '';
54
-	}
51
+    function displayHeaderCell($layout_def)
52
+    {
53
+        return '';
54
+    }
55 55
 
56
-	function displayList($layout_def)
57
-	{
58
-		global $app_strings;
56
+    function displayList($layout_def)
57
+    {
58
+        global $app_strings;
59 59
         global $subpanel_item_count;
60
-		$unique_id = $layout_def['subpanel_id']."_edit_".$subpanel_item_count; //bug 51512
60
+        $unique_id = $layout_def['subpanel_id']."_edit_".$subpanel_item_count; //bug 51512
61 61
 
62 62
         if ($layout_def['EditView']) {
63 63
 
Please login to merge, or discard this patch.