The Unified and Autonomous Development Platform
Add edit link for readme file when list a directory
robin shine392f23921af3
diff --git a/commons.wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.js b/commons.wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.jsindex 2a8046f85d..22d7daa291 100644--- a/commons.wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.js+++ b/commons.wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.js@@ -112,13 +112,11 @@ App = (function() {if ((ref = _this.controller()) != null) {ref.view.hide();}- console.log("compositionstart");_this.isComposing = true;return null;};})(this)).on('compositionend', (function(_this) {return function(e) {- console.log("compositionend");_this.isComposing = false;return null;};diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.html b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.htmlindex 1a89464f38..d56630918d 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.html+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.html@@ -18,7 +18,7 @@</table><div wicket:id="readme" class="readme"><div class="head">- <wicket:link><img src="book.png"/></wicket:link> <span wicket:id="title"></span>+ <span wicket:id="title"></span> <a wicket:id="edit"><i class="fa fa-pencil"></i></a></div><div wicket:id="body" class="body"></div></div>diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.javaindex 906022c155..f40ff84e6f 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java@@ -35,6 +35,8 @@ import com.gitplex.commons.git.BlobIdent;import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;import com.gitplex.server.core.entity.Depot;+import com.gitplex.server.core.security.SecurityUtils;+import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;import com.gitplex.server.web.page.depot.file.DepotFilePage;@SuppressWarnings("serial")@@ -230,6 +232,27 @@ public abstract class FileListPanel extends Panel {}}));++ readmeContainer.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent = readmeModel.getObject();+ state.mode = Mode.EDIT;+ setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depotModel.getObject(), state));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ Depot depot = depotModel.getObject();+ BlobIdent blobIdent = readmeModel.getObject();+ setVisible(depot.getBranchRef(blobIdent.revision) != null+ && SecurityUtils.canModify(depotModel.getObject(), blobIdent.revision, blobIdent.path));+ }++ });readmeContainer.add(new MarkdownPanel("body", new LoadableDetachableModel<String>() {@Overridediff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.css b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.cssindex ea93720d0f..67dcb0d9b4 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.css+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.css@@ -38,15 +38,13 @@}.file-list>.readme>.head {padding: 6px 12px;- background: #EEE;+ background: #F2F2F2;font-weight: bold;border-bottom: 1px solid #BBB;}-.file-list>.readme>.head img {- width: 16px;- height: 16px;- vertical-align: top;- margin-right: 4px;+.file-list>.readme>.head a {+ color: #333;+ margin-left: 4px;}.file-list>.readme>.body {padding: 20px;