Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Dev #T953: Open question group by default (#1972)
Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
  • Loading branch information
gabrieljenik and encuestabizdevgit committed Jul 27, 2021
1 parent d1eb8af commit 5ab381c
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 19 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/packages/adminsidepanel/build.min/js/adminsidepanel.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions assets/packages/adminsidepanel/build/js/adminsidepanel.js

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions assets/packages/adminsidepanel/src/components/sidebar.vue
Expand Up @@ -172,7 +172,9 @@ export default {
LS.ld.each(this.questiongroups, (itm, i) => {
let regTest = new RegExp(
'questionGroupsAdministration/view\\?surveyid=\\d*&gid=' + itm.gid +
'|questionGroupsAdministration/edit\\?surveyid=\\d*&gid=' + itm.gid
'|questionGroupsAdministration/edit\\?surveyid=\\d*&gid=' + itm.gid +
'|questionGroupsAdministration/view/surveyid/\\d*/gid/' + itm.gid +
'|questionGroupsAdministration/edit/surveyid/\\d*/gid/' + itm.gid
);
lastQuestionGroupObject =
regTest.test(currentUrl) || LS.ld.endsWith(currentUrl, itm.link)
Expand All @@ -186,13 +188,18 @@ export default {
LS.ld.each(itm.questions, (itmm, j) => {
let regTest = new RegExp(
'questionAdministration/edit\\?questionId=' + itmm.qid +
'|questionAdministration/view\\?surveyid=\\d*&gid=\\d*&qid=' + itmm.qid
'|questionAdministration/view\\?surveyid=\\d*&gid=\\d*&qid=' + itmm.qid +
'|questionAdministration/edit/questionId/' + itmm.qid +
'|questionAdministration/view/surveyid/\\d*/gid/\\d*/qid/' + itmm.qid
);
lastQuestionObject =
LS.ld.endsWith(currentUrl, itmm.link) ||
regTest.test(currentUrl)
? itmm
: lastQuestionObject;
if (lastQuestionObject != false) {
lastQuestionGroupObject = itm;
}
});
});
Expand Down

0 comments on commit 5ab381c

Please sign in to comment.