Merge branch 'stable-2.14'

* stable-2.14:
  Fix java.lang.ArrayIndexOutOfBoundsException when checking for parent
  ProjectTagsScreen: Fix title of revision field for new tag
  Fix cyclic dependency when using site_path from system_config table

Change-Id: I1f4ed09818885284b9686d38705a20cf21cfce23
This commit is contained in:
Paladox
2017-06-14 14:56:09 +01:00
5 changed files with 8 additions and 3 deletions

View File

@@ -181,6 +181,8 @@ public interface AdminConstants extends Constants {
String initialRevision();
String revision();
String buttonAddBranch();
String buttonDeleteBranch();

View File

@@ -86,6 +86,7 @@ columnBranchRevision = Revision
columnTagName = Tag Name
columnTagRevision = Revision
initialRevision = Initial Revision
revision = Revision
buttonAddBranch = Create Branch
buttonAddTag = Create Tag
buttonDeleteBranch = Delete

View File

@@ -150,7 +150,7 @@ public class ProjectTagsScreen extends PaginatedProjectScreen {
}
}
});
addGrid.setText(1, 0, AdminConstants.I.initialRevision() + ":");
addGrid.setText(1, 0, AdminConstants.I.revision() + ":");
addGrid.setWidget(1, 1, irevTxtBox);
addTag = new Button(AdminConstants.I.buttonAddTag());