Skip to content

Commit 82a77de

Browse files
author
Martin Spielmann
committed
fix fragment markup loading #1 
1 parent 43366f5 commit 82a77de

25 files changed

+106
-106
lines changed

‎src/main/java/com/gitblit/wicket/pages/ActivityPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public ActivityPage(PageParameters params) {
118118
if (app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
119119
Charts charts = createCharts(recentActivity);
120120
add(charts);
121-
add(new Fragment("chartsPanel", "chartsFragment", this));
121+
add(new Fragment("chartsPanel", "chartsFragment", ActivityPage.this));
122122
} else {
123123
add(new Label("chartsPanel").setVisible(false));
124124
}

‎src/main/java/com/gitblit/wicket/pages/ComparePage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public ComparePage(PageParameters params) {
8484
add(new Label("comparison").setVisible(false));
8585
} else {
8686
// active comparison
87-
Fragment comparison = new Fragment("comparison", "comparisonFragment", this);
87+
Fragment comparison = new Fragment("comparison", "comparisonFragment", ComparePage.this);
8888
add(comparison);
8989

9090
RevCommit fromCommit;

‎src/main/java/com/gitblit/wicket/pages/DashboardPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected void addActivity(UserModel user, Collection<RepositoryModel> repositor
8888
}
8989
}
9090

91-
Fragment activityFragment = new Fragment("activity", "activityFragment", this);
91+
Fragment activityFragment = new Fragment("activity", "activityFragment", DashboardPage.this);
9292
add(activityFragment);
9393
activityFragment.add(new Label("feedTitle", feedTitle));
9494
if (digests.size() == 0) {
@@ -240,7 +240,7 @@ protected void addCharts(Fragment frag, List<DailyLogEntry> recentChanges, Set<S
240240
charts.addChart(chart);
241241

242242
add(charts);
243-
frag.add(new Fragment("charts", "chartsFragment", this));
243+
frag.add(new Fragment("charts", "chartsFragment", DashboardPage.this));
244244
} else {
245245
frag.add(new Label("charts").setVisible(false));
246246
}

‎src/main/java/com/gitblit/wicket/pages/DocPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public DocPage(PageParameters params) {
8383
Fragment fragment;
8484
MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);
8585
if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {
86-
fragment = new Fragment("doc", "plainContent", this);
86+
fragment = new Fragment("doc", "plainContent", DocPage.this);
8787
} else {
88-
fragment = new Fragment("doc", "markupContent", this);
88+
fragment = new Fragment("doc", "markupContent", DocPage.this);
8989
}
9090

9191
// document page links

‎src/main/java/com/gitblit/wicket/pages/DocsPage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ public DocsPage(PageParameters params) {
7171
Fragment fragment = null;
7272
if (roots.isEmpty()) {
7373
// no identified root documents
74-
fragment = new Fragment("docs", "noIndexFragment", this);
74+
fragment = new Fragment("docs", "noIndexFragment", DocsPage.this);
7575
setResponsePage(NoDocsPage.class, params);
7676
} else {
7777
// root documents, use tabbed ui of index/root and document list
78-
fragment = new Fragment("docs", "tabsFragment", this);
78+
fragment = new Fragment("docs", "tabsFragment", DocsPage.this);
7979
ListDataProvider<MarkupDocument> docDp = new ListDataProvider<MarkupDocument>(roots);
8080

8181
// tab titles
@@ -143,7 +143,7 @@ public void populateItem(final Item<MarkupDocument> item) {
143143

144144
// document list
145145
final ByteFormat byteFormat = new ByteFormat();
146-
Fragment docs = new Fragment("documents", "documentsFragment", this);
146+
Fragment docs = new Fragment("documents", "documentsFragment", DocsPage.this);
147147
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
148148
DataView<PathModel> pathsView = new DataView<PathModel>("document", pathsDp) {
149149
private static final long serialVersionUID = 1L;

‎src/main/java/com/gitblit/wicket/pages/EditFilePage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public EditFilePage(final PageParameters params) {
103103
final Model<String> commitMessage = new Model<String>("Document update");
104104
final Model<String> commitIdAtLoad = new Model<String>(displayedCommitId);
105105

106-
fragment = new Fragment("doc", "markupContent", this);
106+
fragment = new Fragment("doc", "markupContent", EditFilePage.this);
107107

108108
Form<Void> form = new Form<Void>("documentEditor") {
109109

@@ -182,7 +182,7 @@ protected void onSubmit() {
182182
MarkupDocument markupDoc = processor.parse(repositoryName, displayedCommitId, documentPath, markupText);
183183
final Model<String> documentContent = new Model<String>(markupDoc.html);
184184

185-
fragment = new Fragment("doc", "plainContent", this);
185+
fragment = new Fragment("doc", "plainContent", EditFilePage.this);
186186

187187
fragment.add(new Label("content", documentContent).setEscapeModelStrings(false));
188188
}

‎src/main/java/com/gitblit/wicket/pages/EditTicketPage.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public EditTicketPage(PageParameters params) {
163163
} else {
164164
statusChoices = Arrays.asList(TicketModel.Status.requestWorkflow);
165165
}
166-
Fragment status = new Fragment("status", "statusFragment", this);
166+
Fragment status = new Fragment("status", "statusFragment", EditTicketPage.this);
167167
status.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));
168168
form.add(status);
169169

@@ -200,7 +200,7 @@ public EditTicketPage(PageParameters params) {
200200
}
201201
Collections.sort(responsibles);
202202
responsibles.add(new TicketResponsible(NIL, "", ""));
203-
Fragment responsible = new Fragment("responsible", "responsibleFragment", this);
203+
Fragment responsible = new Fragment("responsible", "responsibleFragment", EditTicketPage.this);
204204
responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));
205205
form.add(responsible.setVisible(!responsibles.isEmpty()));
206206

@@ -224,12 +224,12 @@ public EditTicketPage(PageParameters params) {
224224
}
225225

226226
// milestone
227-
Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
227+
Fragment milestone = new Fragment("milestone", "milestoneFragment", EditTicketPage.this);
228228
milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
229229
form.add(milestone.setVisible(!milestones.isEmpty()));
230230

231231
// priority
232-
Fragment priority = new Fragment("priority", "priorityFragment", this);
232+
Fragment priority = new Fragment("priority", "priorityFragment", EditTicketPage.this);
233233
List<TicketModel.Priority> priorityChoices = Arrays.asList(TicketModel.Priority.choices());
234234
priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, priorityChoices));
235235
form.add(priority);
@@ -245,7 +245,7 @@ public EditTicketPage(PageParameters params) {
245245
branches.remove(Repository.shortenRefName(getRepositoryModel().mergeTo));
246246
branches.add(0, Repository.shortenRefName(getRepositoryModel().mergeTo));
247247

248-
Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);
248+
Fragment mergeto = new Fragment("mergeto", "mergeToFragment", EditTicketPage.this);
249249
mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));
250250
form.add(mergeto.setVisible(!branches.isEmpty()));
251251
} else {

‎src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ public int compare(RepositoryModel o1, RepositoryModel o2) {
159159

160160
Fragment repositoryTabs;
161161
if (UserModel.ANONYMOUS.equals(user)) {
162-
repositoryTabs = new Fragment("repositoryTabs", "anonymousTabsFragment", this);
162+
repositoryTabs = new Fragment("repositoryTabs", "anonymousTabsFragment", MyDashboardPage.this);
163163
} else {
164-
repositoryTabs = new Fragment("repositoryTabs", "authenticatedTabsFragment", this);
164+
repositoryTabs = new Fragment("repositoryTabs", "authenticatedTabsFragment", MyDashboardPage.this);
165165
}
166166

167167
add(repositoryTabs);

‎src/main/java/com/gitblit/wicket/pages/NewTicketPage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ public NewTicketPage(PageParameters params) {
149149
}
150150
}
151151
Collections.sort(responsibles);
152-
Fragment responsible = new Fragment("responsible", "responsibleFragment", this);
152+
Fragment responsible = new Fragment("responsible", "responsibleFragment", NewTicketPage.this);
153153
responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));
154154
form.add(responsible.setVisible(!responsibles.isEmpty()));
155155

156156
// milestone
157157
List<TicketMilestone> milestones = app().tickets().getMilestones(getRepositoryModel(), Status.Open);
158-
Fragment milestone = new Fragment("milestone", "milestoneFragment", this);
158+
Fragment milestone = new Fragment("milestone", "milestoneFragment", NewTicketPage.this);
159159
milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
160160
form.add(milestone.setVisible(!milestones.isEmpty()));
161161

162162
// priority
163-
Fragment priority = new Fragment("priority", "priorityFragment", this);
163+
Fragment priority = new Fragment("priority", "priorityFragment", NewTicketPage.this);
164164
priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, Arrays.asList(TicketModel.Priority.choices())));
165165
form.add(priority);
166166

@@ -175,7 +175,7 @@ public NewTicketPage(PageParameters params) {
175175
branches.remove(Repository.shortenRefName(getRepositoryModel().HEAD));
176176
branches.add(0, Repository.shortenRefName(getRepositoryModel().HEAD));
177177

178-
Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);
178+
Fragment mergeto = new Fragment("mergeto", "mergeToFragment", NewTicketPage.this);
179179
mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));
180180
form.add(mergeto.setVisible(!branches.isEmpty()));
181181
} else {

‎src/main/java/com/gitblit/wicket/pages/RepositoryPage.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,16 @@ protected void setupPage(String repositoryName, String pageName) {
305305
RepositoryModel model = getRepositoryModel();
306306
if (StringUtils.isEmpty(model.originRepository)) {
307307
if (model.isMirror) {
308-
add(new Fragment("repoIcon", "mirrorIconFragment", this));
309-
Fragment mirrorFrag = new Fragment("originRepository", "mirrorFragment", this);
308+
add(new Fragment("repoIcon", "mirrorIconFragment", RepositoryPage.this));
309+
Fragment mirrorFrag = new Fragment("originRepository", "mirrorFragment", RepositoryPage.this);
310310
Label lbl = new Label("originRepository", MessageFormat.format(getString("gb.mirrorOf"), "<b>" + model.origin + "</b>"));
311311
mirrorFrag.add(lbl.setEscapeModelStrings(false));
312312
add(mirrorFrag);
313313
} else {
314314
if (model.isBare) {
315-
add(new Fragment("repoIcon", "repoIconFragment", this));
315+
add(new Fragment("repoIcon", "repoIconFragment", RepositoryPage.this));
316316
} else {
317-
add(new Fragment("repoIcon", "cloneIconFragment", this));
317+
add(new Fragment("repoIcon", "cloneIconFragment", RepositoryPage.this));
318318
}
319319
add(new Label("originRepository", Optional.of(model.description).or("")));
320320
}
@@ -323,21 +323,21 @@ protected void setupPage(String repositoryName, String pageName) {
323323
if (origin == null) {
324324
// no origin repository, show description if available
325325
if (model.isBare) {
326-
add(new Fragment("repoIcon", "repoIconFragment", this));
326+
add(new Fragment("repoIcon", "repoIconFragment", RepositoryPage.this));
327327
} else {
328-
add(new Fragment("repoIcon", "cloneIconFragment", this));
328+
add(new Fragment("repoIcon", "cloneIconFragment", RepositoryPage.this));
329329
}
330330
add(new Label("originRepository", Optional.of(model.description).or("")));
331331
} else if (!user.canView(origin)) {
332332
// show origin repository without link
333-
add(new Fragment("repoIcon", "forkIconFragment", this));
334-
Fragment forkFrag = new Fragment("originRepository", "originFragment", this);
333+
add(new Fragment("repoIcon", "forkIconFragment", RepositoryPage.this));
334+
Fragment forkFrag = new Fragment("originRepository", "originFragment", RepositoryPage.this);
335335
forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(model.originRepository)));
336336
add(forkFrag);
337337
} else {
338338
// link to origin repository
339-
add(new Fragment("repoIcon", "forkIconFragment", this));
340-
Fragment forkFrag = new Fragment("originRepository", "originFragment", this);
339+
add(new Fragment("repoIcon", "forkIconFragment", RepositoryPage.this));
340+
Fragment forkFrag = new Fragment("originRepository", "originFragment", RepositoryPage.this);
341341
forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(model.originRepository),
342342
SummaryPage.class, WicketUtils.newRepositoryParameter(model.originRepository)));
343343
add(forkFrag);
@@ -415,7 +415,7 @@ protected void setupPage(String repositoryName, String pageName) {
415415
}
416416

417417
protected void addToolbarButton(String wicketId, String iconClass, String label, String url) {
418-
Fragment button = new Fragment(wicketId, "toolbarLinkFragment", this);
418+
Fragment button = new Fragment(wicketId, "toolbarLinkFragment", RepositoryPage.this);
419419
Label icon = new Label("icon");
420420
WicketUtils.setCssClass(icon, iconClass);
421421
button.add(icon);
@@ -621,14 +621,14 @@ protected Component createPersonPanel(String wicketId, PersonIdent identity,
621621
value = getString("gb.missingUsername");
622622
}
623623
}
624-
Fragment partial = new Fragment(wicketId, "partialPersonIdent", this);
624+
Fragment partial = new Fragment(wicketId, "partialPersonIdent", RepositoryPage.this);
625625
LinkPanel link = new LinkPanel("personName", "list", value, GitSearchPage.class,
626626
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType));
627627
setPersonSearchTooltip(link, value, searchType);
628628
partial.add(link);
629629
return partial;
630630
} else {
631-
Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", this);
631+
Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", RepositoryPage.this);
632632
LinkPanel nameLink = new LinkPanel("personName", "list", name, GitSearchPage.class,
633633
WicketUtils.newSearchParameter(repositoryName, objectId, name, searchType));
634634
setPersonSearchTooltip(nameLink, name, searchType);

0 commit comments

Comments
 (0)