fixes #100: -edit assignee & reporter

Author: rudiedirkx

issue.php

@@ -6,10 +6,9 @@
 
 $key = $_GET['key'];
 
-if ( isset($_POST['summary'], $_POST['description'], $_POST['reporter'], $_POST['issuetype'], $_POST['priority'], $_POST['comment']) ) {
+if ( isset($_POST['summary'], $_POST['description'], $_POST['issuetype'], $_POST['priority'], $_POST['comment']) ) {
 	$summary = trim($_POST['summary']);
 	$description = trim($_POST['description']);
-	$reporter = trim($_POST['reporter']);
 	$issuetype = trim($_POST['issuetype']);
 	$priority = trim($_POST['priority']);
 	$comment = trim($_POST['comment']);
@@ -21,9 +20,6 @@
 		'issuetype' => ['id' => $issuetype],
 		'priority' => ['id' => $priority],
 	);
-	if ( $reporter ) {
-		$fields['reporter'] = ['name' => $reporter];
-	}
 	if ( $comment ) {
 		$update['comment'] = [['add' => ['body' => $comment]]];
 	}
@@ -150,7 +146,6 @@
 	// Description
 	// Issue type
 	// Priority
-	// Reporter
 
 	$meta = jira_get('issue/' . $key . '/editmeta', array('expand' => 'projects.issuetypes.fields'), $error, $info);
 
@@ -172,8 +167,6 @@
 	echo '	<p>Issue type: <select name="issuetype">' . html_options($issuetypes, $fields->issuetype->id) . '</select></p>';
 	echo '	<p>Priority: <select name="priority">' . html_options($priorities, @$fields->priority->id, '?') . '</select></p>';
 
-	echo '	<p>Reporter (' . $fields->reporter->name . '): <input name="reporter" /></p>';
-
 	echo '	<p>Add comment: <textarea name="comment" rows="4"></textarea><br><button type="button" data-preview="textarea[name=comment]">Preview</button></p>';
 
 	echo '	<p><input type="submit" /></p>';

tpl.issueheader.php

@@ -6,7 +6,6 @@
 
 $actions = array();
 $actions['Edit'] = 'issue.php?key=' . $key . '&edit';
-$actions['Assign'] = $actionPath . 'assign';
 foreach ( $issue->transitions AS $transition ) {
 	$actions[$transition->name] = $actionPath . $transition->id;
 }
@@ -49,7 +48,7 @@
 }
 $meta[] = html($fields->reporter->displayName) . ' (' . date(FORMAT_DATETIME, $issue->created) . ')';
 $meta[] = html_icon($fields->status, 'status') . ' <strong>' . html($fields->status->name) . $resolution . '</strong>';
-$meta[] = '<em>' . ( html(@$fields->assignee->displayName) ?: 'No assignee' ) . '</em>';
+$meta[] = '<em>' . html($fields->assignee->displayName ?? 'No assignee') . '</em>';
 if ( $fields->labels ) {
 	$meta[] = html_labels($fields->labels);
 }

transition.php

@@ -14,57 +14,19 @@
 	$resolution = trim(@$_POST['resolution']);
 	$comment = trim($_POST['comment']);
 
-	$assigneetype = trim(@$_POST['assigneetype']);
-	$assignee = trim(@$_POST['assignee']);
-	if ( $assigneetype == 'unassign' ) {
-		$assignee = null;
-	}
-	else if ( $assigneetype == 'me' ) {
-		$assignee = JIRA_USER;
-	}
-
 	$update = array();
 
-	// ASSIGN
-	if ( $status == 'assign' ) {
-		if ( $assignee === '' ) {
-			echo "Must enter assignee username.";
-			exit;
-		}
-
-		// Add comment
-		if ( $comment ) {
-			$response = jira_post('issue/' . $key . '/comment', array('body' => $comment), $error, $info);
-		}
-		else {
-			$error = false;
-		}
-
-		// Only move forward if that worked, since this action requires 2 API calls =(
-		if ( !$error ) {
-			// Change assignee
-			$update['name'] = $assignee === null ? null : explode('@', $assignee)[0];
-			$response = jira_put('issue/' . $key . '/assignee', $update, $error, $info);
-		}
+	if ( $comment ) {
+		$update['update']['comment'][0]['add']['body'] = $comment;
 	}
-
-	// TRANSITION
-	else {
-		if ( $comment ) {
-			$update['update']['comment'][0]['add']['body'] = $comment;
-		}
-		if ( $assignee !== '' ) {
-			$update['fields']['assignee']['name'] = $assignee;
-		}
-		if ( $resolution ) {
-			$update['fields']['resolution']['name'] = $resolution;
-		}
-		if ( $status ) {
-			$update['transition']['id'] = $status;
-		}
-
-		$response = jira_post('issue/' . $key . '/transitions', $update, $error, $info);
+	if ( $resolution ) {
+		$update['fields']['resolution']['name'] = $resolution;
 	}
+	if ( $status ) {
+		$update['transition']['id'] = $status;
+	}
+
+	$response = jira_post('issue/' . $key . '/transitions', $update, $error, $info);
 
 	if ( !$error ) {
 		return do_redirect('issue', array('key' => $key));
@@ -84,7 +46,6 @@
 
 $actions = $transitionsById = array();
 $actions[''] = '-- No change';
-$actions['assign'] = 'Assign';
 foreach ( $transitions->transitions AS $transition ) {
 	$transitionsById[$transition->id] = $transition;
 	$actions[$transition->id] = $transition->name;
@@ -112,14 +73,6 @@
 }
 echo '<p>Comment:<br><textarea name="comment" rows="8"></textarea><br><button type="button" data-preview="textarea[name=comment]">Preview</button></p>';
 
-if ( $action == 'assign' || isset($transitionsById[$action]->fields->assignee) ) {
-	echo '<p>Change assignee?<br />';
-	echo '<input type="radio" name="assigneetype" value="unassign" /> Unassign<br />';
-	echo '<input type="radio" name="assigneetype" value="me" /> Assign to me<br />';
-	echo '<input type="radio" name="assigneetype" value="other" checked /> No change, or assign to: <input name="assignee" style="width: 7em" placeholder="username" />';
-	echo '</p>';
-}
-
 echo '<p><input type="submit" /></p>';
 echo '</form>';
 echo '</div>';