opendev/gerrit
Code Issues Proposed changes

Revert "Add submit_action to ChangeInfo"

Browse Source 
This reverts commit 0efb17e053.
This is already available on a revision as /submit_type.
Clients that need the data should fetch it from there.

Change-Id: Ia6ba213117c4a5c2a09d1129ab741871dfd31a22
This commit is contained in:
Shawn Pearce
2013-07-12 19:01:47 +00:00
parent 0efb17e053
commit 13641f4f46
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/rest-api-changes.txt
View File

@@ -2389,12 +2389,6 @@ Only set if link:#messages[messages] are requested.
The commit ID of the current patch set of this change. + The commit ID of the current patch set of this change. +
Only set if link:#current-revision[the current revision] is requested Only set if link:#current-revision[the current revision] is requested
or if link:#all-revisions[all revisions] are requested. or if link:#all-revisions[all revisions] are requested.
|`submit_action` |optional|
Submit action/algorithm the server will employ to merge the change. +
Set only if the change status is open, link:#detailed-labels[detailed
labels] is requested, and if link:#current-revision[the current
revision] is requested or if link:#all-revisions[all revisions] are
requested.
|`revisions` |optional| |`revisions` |optional|
All patch sets of this change as a map that maps the commit ID of the All patch sets of this change as a map that maps the commit ID of the
patch set to a link:#revision-info[RevisionInfo] entity. + patch set to a link:#revision-info[RevisionInfo] entity. +

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
View File

@@ -78,7 +78,6 @@ public class ChangeInfo extends JavaScriptObject {
public final native String topic() /*-{ return this.topic; }-*/; public final native String topic() /*-{ return this.topic; }-*/;
public final native String change_id() /*-{ return this.change_id; }-*/; public final native String change_id() /*-{ return this.change_id; }-*/;
public final native boolean mergeable() /*-{ return this.mergeable; }-*/; public final native boolean mergeable() /*-{ return this.mergeable; }-*/;
public final native String submit_action() /*-{ return this.submit_action; }-*/;
private final native String statusRaw() /*-{ return this.status; }-*/; private final native String statusRaw() /*-{ return this.status; }-*/;
public final native String subject() /*-{ return this.subject; }-*/; public final native String subject() /*-{ return this.subject; }-*/;
public final native AccountInfo owner() /*-{ return this.owner; }-*/; public final native AccountInfo owner() /*-{ return this.owner; }-*/;

11
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -45,7 +45,6 @@ import com.google.gerrit.common.data.LabelValue;
import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.Permission;
import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.common.data.PermissionRange;
import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.common.data.SubmitTypeRecord;
import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
@@ -277,15 +276,6 @@ public class ChangeJson {
} }
} }
} }
if (in.getStatus().isOpen()
&& has(ListChangesOption.DETAILED_LABELS)
&& out.current_revision != null) {
SubmitTypeRecord r = cd.changeControl().getSubmitTypeRecord(
db.get(), cd.currentPatchSet(db), cd);
if (r.status == SubmitTypeRecord.Status.OK) {
out.submit_action = r.type.name();
}
}
} }
lastControl = null; lastControl = null;
@@ -851,7 +841,6 @@ public class ChangeJson {
public String changeId; public String changeId;
public String subject; public String subject;
Change.Status status; Change.Status status;
String submit_action;
Timestamp created; Timestamp created;
Timestamp updated; Timestamp updated;
Boolean starred; Boolean starred;