api soap: correct usage of bugnote_set_view_state

rombert · rombert · commit 938ce311a36a · 2012-08-09T22:50:45.000+03:00
Fixes #14573: Updating an issue's view state always sets it to private
diff --git a/api/soap/mc_issue_api.php b/api/soap/mc_issue_api.php
@@ -1125,7 +1125,7 @@ function mc_issue_note_update( $p_username, $p_password, $p_note ) {
 	if ( isset( $p_note['view_state'] ) ) {
 		$t_view_state = $p_note['view_state'];
 		$t_view_state_id = mci_get_enum_id_from_objectref( 'view_state', $t_view_state );
-		bugnote_set_view_state( $t_issue_note_id, $t_view_state_id );
+		bugnote_set_view_state( $t_issue_note_id, $t_view_state_id == VS_PRIVATE );
 	}
 
 	bugnote_set_text( $t_issue_note_id, $p_note['text'] );
diff --git a/tests/soap/IssueNoteTest.php b/tests/soap/IssueNoteTest.php
@@ -189,7 +189,8 @@ public function testAddThenUpdateThenDeleteNote() {
 		
         $noteDataNew = array(
             'id' => $issueNoteId,
-            'text' => "some new note"
+            'text' => "some new note",
+        	'view_state' => array ( 'id' => 10 /* public */)
         );
 
         $this->client->mc_issue_note_update(
@@ -203,8 +204,8 @@ public function testAddThenUpdateThenDeleteNote() {
             $issueId);
 
         $this->assertEquals( 1, count( $issueWithNote->notes ) );
-
         $this->assertEquals( $noteDataNew['text'], $issueWithNewNote->notes[0]->text );
+        $this->assertEquals( 'public', $issueWithNewNote->notes[0]->view_state->name );
 
 		$this->client->mc_issue_note_delete(
 			$this->userName,

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ function mc_issue_note_update( $p_username, $p_password, $p_note ) {`
`1125`	`1125`	`if ( isset( $p_note['view_state'] ) ) {`
`1126`	`1126`	`$t_view_state = $p_note['view_state'];`
`1127`	`1127`	`$t_view_state_id = mci_get_enum_id_from_objectref( 'view_state', $t_view_state );`
`1128`		`- bugnote_set_view_state( $t_issue_note_id, $t_view_state_id );`
	`1128`	`+ bugnote_set_view_state( $t_issue_note_id, $t_view_state_id == VS_PRIVATE );`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`	`1131`	`bugnote_set_text( $t_issue_note_id, $p_note['text'] );`