From: Alan Pippin <apippin@pippins.net>
Date: Sun, 3 Oct 2010 22:47:35 +0000 (-0600)
Subject: Merge branch 'master' of git@github.com:apippin/tc
X-Git-Tag: release_1_1_0~18
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=10ad4c2678cb664844bfbc5066f0b817c6cb4a2f;hp=342d545bad2f6d8d5112d047c0b5b88ffdba5394;p=eq%2F.git

Merge branch 'master' of git@github.com:apippin/tc
---

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 1e9a46a..47dee2e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -2457,15 +2457,16 @@ class tc
 			$indiv = $this->db2->f('individual');
 			$interviewer_name = $this->db2->f('name');
 			if($indiv == $interviewer) {
-				$this->t->set_var('interviewer',$interviewer . ' selected');
+				$this->t->set_var('interviewer',$indiv . ' selected');
 			} else {
-				$this->t->set_var('interviewer',$interviewer);
+				$this->t->set_var('interviewer',$indiv);
 			}
+			#print "indiv: $indiv interviewer: $interviewer<br>";
 			$this->t->set_var('interviewer_name',$interviewer_name);
 			$this->t->set_var('eqpresppi_checked','checked');
 			$this->t->fp('int_list','interviewer_list',True);
 		}
-
+		#print "selected interviewer: $interviewer<br>";
 		if($action == 'save') {
 			$notes = get_var('notes',array('POST'));
 			$this->db->query("UPDATE tc_interview set " .
@@ -2782,9 +2783,9 @@ class tc
 			$indiv = $this->db2->f('individual');
 			$interviewer_name = $this->db2->f('name');
 			if($indiv == $interviewer) {
-				$this->t->set_var('interviewer',$interviewer . ' selected');
+				$this->t->set_var('interviewer',$indiv . ' selected');
 			} else {
-				$this->t->set_var('interviewer',$interviewer);
+				$this->t->set_var('interviewer',$indiv);
 			}
 			$this->t->set_var('interviewer_name',$interviewer_name);
 			$this->t->fp('int_list','interviewer_list',True);
diff --git a/templates/default/ppi_update.tpl b/templates/default/ppi_update.tpl
index 80a8dc4..e8c6cb4 100644
--- a/templates/default/ppi_update.tpl
+++ b/templates/default/ppi_update.tpl
@@ -16,7 +16,7 @@
 		</tr>
 		<tr>
 			<td align="left"><font face="{font}"><b>Interviewer:</b>&nbsp;
-			<select name="interviewer">
+			<select name="interviewer" {disabled}>
 <!-- BEGIN interviewer_list -->
 			<option value={interviewer}>{interviewer_name}</option>
 <!-- END interviewer_list -->