From 6c3eb6a460caa06f661de56f345f758b02ab5ff0 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@rc-d.net>
Date: Thu, 16 Nov 2017 10:53:16 -0500
Subject: [PATCH] Update ProcessTemplate so that it lets you specify when
 fields user can edit in their profile, when editing the "user" template.
 Meaning, it's no longer necessary to jump back and forth between
 ProcessProfile and the ProcessProfile module config.

---
 .../ProcessTemplate/ProcessTemplate.module    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/wire/modules/Process/ProcessTemplate/ProcessTemplate.module b/wire/modules/Process/ProcessTemplate/ProcessTemplate.module
index 4a3b4489..627b92d7 100644
--- a/wire/modules/Process/ProcessTemplate/ProcessTemplate.module
+++ b/wire/modules/Process/ProcessTemplate/ProcessTemplate.module
@@ -757,7 +757,20 @@ class ProcessTemplate extends Process {
 		$f->attr('id+name', '_fieldgroup_fields_changed');
 		$f->attr('value', '');
 		$t->add($f);
-		if($template->name != $template->fieldgroup->name || $this->config->advanced) $t->add($this->buildEditFormFieldgroup($template));
+		
+		if(in_array($template->id, $this->wire('config')->userTemplateIDs)) {
+			/** @var ProcessProfile $profile */
+			$profile = $this->wire('modules')->get('ProcessProfile');
+			$profileInputs = $profile->getModuleConfigInputfields(array('profileFields' => $profile->profileFields));
+			$f = $profileInputs->getChildByName('profileFields');
+			$f->attr('id+name', '_user_profile_fields');
+			$f->description = $this->_('If you just added fields above, save first and then return here to select them.'); 
+			$t->add($f);
+		}
+
+		if($template->name != $template->fieldgroup->name || $this->config->advanced) {
+			$t->add($this->buildEditFormFieldgroup($template));
+		}
 	
 		/** @var InputfieldText $f */
 		$f = $this->modules->get('InputfieldText');
@@ -945,10 +958,6 @@ class ProcessTemplate extends Process {
 		$select->setAsmSelectOption('editLink', $this->wire('config')->urls->admin . "setup/field/edit?id={value}&fieldgroup_id={$template->fieldgroup->id}&modal=1&process_template=1"); 
 		$select->setAsmSelectOption('hideDeleted', false);
 		
-		if(in_array($template->id, $this->wire('config')->userTemplateIDs)) {
-			$select->notes = sprintf($this->_('To configure what fields a user can edit in their profile, see the [profile module settings](%s).'), $this->wire('config')->urls->admin . 'module/edit?name=ProcessProfile');
-		}
-
 		foreach($template->fieldgroup as $field) {
 			$field = $template->fieldgroup->getField($field->id, true); // get in context
 			$attrs = $this->getAsmListAttrs($field); 
@@ -2298,6 +2307,16 @@ class ProcessTemplate extends Process {
 			return;
 		}
 
+		if(in_array($template->id, $this->wire('config')->userTemplateIDs)) {
+			$f = $form->getChildByName('_user_profile_fields');
+			$data = $this->wire('modules')->getConfig('ProcessProfile');
+			if($f && $data['profileFields'] != $f->val()) {
+				$data['profileFields'] = $f->val();
+				$this->wire('modules')->saveConfig('ProcessProfile', $data);
+				$this->message("Updated user profile fields", Notice::debug); 
+			}	
+		}
+
 		if($input->post('fieldgroup') && $input->post('fieldgroup') != $template->fieldgroup->id) {
 			$redirectUrl = "fieldgroup?id={$template->id}&fieldgroup=" . (int) $input->post('fieldgroup');
 		}