Board: Fix problems caused by the introduction of upgrade
- `requestHeader.getQueryString("readme")` can return `None` instead of null string. - Now, markdown is rendered at serverside, so loading image doesn't disapear at view page. This patch fix those problems.
@2e2725d97600a208eeccb5e5c2f40cee7f9fdb89
--- app/views/board/create.scala.html
+++ app/views/board/create.scala.html
... | ... | @@ -27,7 +27,7 @@ |
27 | 27 |
@implicitField = @{ helper.FieldConstructor(simpleForm) } |
28 | 28 |
|
29 | 29 |
@readmeUpdateMessage = @{ |
30 |
- if( requestHeader.getQueryString("readme") != null ) { |
|
30 |
+ if( !requestHeader.getQueryString("readme").equals(None) ) { |
|
31 | 31 |
"Update README.md" |
32 | 32 |
} |
33 | 33 |
} |
... | ... | @@ -58,15 +58,14 @@ |
58 | 58 |
@common.editor("body", preparedPostBody, "tabindex=2") |
59 | 59 |
</dd> |
60 | 60 |
</dl> |
61 |
- |
|
62 |
- @** fileUploader **@ |
|
61 |
+ @** fileUploader **@ |
|
63 | 62 |
@if(!UserApp.currentUser.isAnonymous) { |
64 | 63 |
@common.fileUploader(ResourceType.BOARD_POST, null) |
65 | 64 |
} |
66 | 65 |
@** end of fileUploader **@ |
67 | 66 |
|
68 | 67 |
<div class="right-txt mt10 mb10"> |
69 |
- @if(isAllowedToNotice && !stringToBoolean(requestHeader.getQueryString("readme").get)){ |
|
68 |
+ @if(isAllowedToNotice ){ |
|
70 | 69 |
<label class="checkbox"> |
71 | 70 |
<input type="checkbox" id="notice" name="notice"> |
72 | 71 |
@Messages("post.notice.label") |
... | ... | @@ -74,9 +73,9 @@ |
74 | 73 |
} |
75 | 74 |
|
76 | 75 |
@if(isProjectResourceCreatable(UserApp.currentUser(), project, ResourceType.COMMIT)){ |
77 |
- @if(project.isGit && stringToBoolean(requestHeader.getQueryString("readme").get)){ |
|
76 |
+ @if(project.isGit && !requestHeader.getQueryString("readme").equals(None)){ |
|
78 | 77 |
<label class="checkbox"> |
79 |
- <input type="checkbox" id="readme" name="readme" @boolToCheckedString(requestHeader.getQueryString("readme"))> |
|
78 |
+ <input type="checkbox" id="readme" name="readme" @boolToCheckedString(!requestHeader.getQueryString("readme").equals(None))> |
|
80 | 79 |
@Messages("post.readmefy") |
81 | 80 |
</label> |
82 | 81 |
} |
--- app/views/board/view.scala.html
+++ app/views/board/view.scala.html
... | ... | @@ -61,9 +61,6 @@ |
61 | 61 |
} |
62 | 62 |
</a> |
63 | 63 |
</div> |
64 |
- <div class="markdown-loader"> |
|
65 |
- <i class="yobicon-loading2"></i> @Messages("common.loading") |
|
66 |
- </div> |
|
67 | 64 |
<div class="content markdown-wrap">@Html(Markdown.render(post.body, post.asResource().getProject()))</div> |
68 | 65 |
<div class="attachments" id="attachments" data-attachments="@toJson(AttachmentApp.getFileList(ResourceType.BOARD_POST.toString(), post.id.toString()))"></div> |
69 | 66 |
</div> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?