summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Daarstad <tomas.daarstad@tieto.com>2012-04-03 09:39:15 +0200
committerTomas Daarstad <tomas.daarstad@tieto.com>2012-04-03 09:39:48 +0200
commitc7a39fc0e13b518c5cd723438db5b65781b222f1 (patch)
treec70b2ad11771d62adde2c03db1636740583eb285
parentac7b907ab559a8c5b91e1641196d4d3fbd04e3f7 (diff)
parent917bd35f0757e62db34a53acce45aafec41389f9 (diff)
Integration release of NQt GerritRC-V2.2.1-INT-017
Fixed JIRA issues: 167 Fixed gerrit email verification link requires insecure login 195 Added support for European style dates 220 Added a check to prevent NumberFormatException 270 Fixed review database update from StagingApprove 335 Fixed automatic update of reviewer list 340 Don't send mail for publishing comments for stage approved 347 Fixed late removal of review approvals 348 Fixed cherry pick footer settings 350 Consider sanity review column 352 Fix typo in project config's topic review checkbox label 355 Hide review panel also on diff and topic pages 357 Add support for public anonymous access to gerrit 366 Added check if stage and submit button is null 372 Validate topic current change set 375 Topic permalink copy to clipboard corrected 381 Do not permit trailing slash when pushing 382 Integration release of NQt Gerrit 382 Added a check to prevent NullPointerException Added a check to prevent ArrayIndexOutOfBoundsException 385 Keep highlight on review request 389 Set patch approval changeOpen to false 411 Updated to use current patch id in loadFileList method. 456 Remove leading and trailing whitespace in username when creating a request 462 Updated for eclipse 3.7, m2e and fixed the full name of the MAVEN2_CLASSPATH_CONTAINER 468 Fixed the Review score put on wrong change Change-Id: I4c2d6f48d4ea228250ce133fcc5a15452ac34bfb
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java39
1 files changed, 26 insertions, 13 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
index 9224e5ace2..d70e70233f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java
@@ -385,19 +385,32 @@ class ChangeSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
Util.T_DETAIL_SVC.topicDetail(topicDetail.getTopic().getId(), new GerritCallback<TopicDetail>() {
public void onSuccess(TopicDetail result) {
- if(changeTable.getChangeSetIsReviewed()){
- submitChangeSetButton.setEnabled(true);
- stageChangeSetButton.setEnabled(true);
- }else{
- submitChangeSetButton.setEnabled(false);
- stageChangeSetButton.setEnabled(false);
- }
- }
+ if (submitChangeSetButton != null) {
+ if (changeTable.getChangeSetIsReviewed()) {
+ submitChangeSetButton.setEnabled(true);
+ } else {
+ submitChangeSetButton.setEnabled(false);
+ }
+ }
- public void onFailure(Throwable caught) {
- submitChangeSetButton.setEnabled(false);
- stageChangeSetButton.setEnabled(false);
- }
- });
+ if (stageChangeSetButton != null) {
+ if (changeTable.getChangeSetIsReviewed()) {
+ stageChangeSetButton.setEnabled(true);
+ } else {
+ stageChangeSetButton.setEnabled(false);
+ }
+ }
+
+ }
+
+ public void onFailure(Throwable caught) {
+ if (submitChangeSetButton != null) {
+ submitChangeSetButton.setEnabled(false);
+ }
+ if (stageChangeSetButton != null) {
+ stageChangeSetButton.setEnabled(false);
+ }
+ }
+ });
}
}