Skip to content

Commit f488cff

Browse files
authored
Merge pull request support-project#1020 from support-project/answer_button
Fix control of survey answer button
2 parents dc155df + 9a60f0f commit f488cff

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-menu-buttons.jsp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@
9494
<i class="fa fa-check-square-o"></i>&nbsp;
9595
<%=jspUtil.label("knowledge.view.label.answer")%>
9696
</a>
97+
<a id="btnLoginToAnswerSurvey" class="btn btn-info btn_col2 hide"
98+
href="<%= request.getContextPath() %>/protect.knowledge/view/<%=jspUtil.out("knowledgeId")%>">
99+
<i class="fa fa-check-square-o"></i>&nbsp;
100+
<%=jspUtil.label("knowledge.view.label.answer")%>
101+
</a>
97102
</div>
98103

99104
<%

src/main/webapp/js/knowledge-view-survey.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@ $(document).ready(function() {
88
if (data.msg || !data.exist) {
99
return;
1010
}
11-
$('#btnAnswerSurvey').removeClass('hide');
1211
$('#modalAnswerSurveyLabel').text(data.title);
1312
$('#surveyDescription').text(data.description);
1413
document.__add_Template_Edit_Item(data);
14+
if (_LOGIN_USER_ID) {
15+
$('#btnAnswerSurvey').removeClass('hide');
16+
} else {
17+
if (data.loginNecessary) {
18+
$('#btnLoginToAnswerSurvey').removeClass('hide');
19+
} else {
20+
$('#btnAnswerSurvey').removeClass('hide');
21+
}
22+
}
1523
}).fail(function(err) {
1624
console.log(err);
1725
});

0 commit comments

Comments
 (0)