api soap: correct usage of bugnote_set_view_state

rombert · rombert · commit 4c4e658dc9c4 · 2012-08-09T22:50:30.000+03:00
Fixes #14573: Updating an issue's view state always sets it to private 

Conflicts:
	tests/soap/IssueNoteTest.php
diff --git a/api/soap/mc_issue_api.php b/api/soap/mc_issue_api.php
@@ -1129,7 +1129,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(
@@ -202,7 +203,9 @@ public function testAddThenUpdateThenDeleteNote() {
             $this->password,
             $issueId);
 
-        $this->assertEquals( 1, count( $issueWithNote->notes ) );		
+        $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
`@@ -1129,7 +1129,7 @@ function mc_issue_note_update( $p_username, $p_password, $p_note ) {`
`1129`	`1129`	`if ( isset( $p_note['view_state'] ) ) {`
`1130`	`1130`	`$t_view_state = $p_note['view_state'];`
`1131`	`1131`	`$t_view_state_id = mci_get_enum_id_from_objectref( 'view_state', $t_view_state );`
`1132`		`- bugnote_set_view_state( $t_issue_note_id, $t_view_state_id );`
	`1132`	`+ bugnote_set_view_state( $t_issue_note_id, $t_view_state_id == VS_PRIVATE );`
`1133`	`1133`	`}`
`1134`	`1134`
`1135`	`1135`	`bugnote_set_text( $t_issue_note_id, $p_note['text'] );`