Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-5119-Prevent create new neXboard (Front) #3313

Merged
merged 18 commits into from
Nov 20, 2023
Merged

BC-5119-Prevent create new neXboard (Front) #3313

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
06b12cb
Hide nextBoard button for teacher.
Michaellinaresxk Sep 22, 2023
e6c6434
testing.
Michaellinaresxk Sep 22, 2023
352fce6
Added middleware to confirm isTeacher.
Michaellinaresxk Oct 5, 2023
fb53d25
Created functionality to ignore copy nextboard.
Michaellinaresxk Nov 5, 2023
cb3d689
Removed isTeacher variable.
Michaellinaresxk Nov 8, 2023
8eda083
Prepared the TopicEtherpad button for hiding test.
Michaellinaresxk Nov 13, 2023
c8f0dd6
Merge branch 'main' into BC-5119-Prevent-creating-new-neXboards
Michaellinaresxk Nov 13, 2023
579acce
Disabled nexboard button on edit topic.
Michaellinaresxk Nov 14, 2023
8e21c25
Merge branch 'BC-5119-Prevent-creating-new-neXboards' of https://gith…
Michaellinaresxk Nov 14, 2023
f08f565
Fixed typo on data test.
Michaellinaresxk Nov 15, 2023
5d04e4c
Remove Etherpad configuration for to displayed locally.
Michaellinaresxk Nov 16, 2023
aabe695
Conflict resolved.
Michaellinaresxk Nov 17, 2023
07fea1a
Resolving conflict.
Michaellinaresxk Nov 17, 2023
81cc7ed
Button Removed on topic edit .
Michaellinaresxk Nov 17, 2023
f2c4d6d
Identation fixed.
Michaellinaresxk Nov 17, 2023
d4f5bd1
Identation fixed.
Michaellinaresxk Nov 17, 2023
d34fb2f
fix indentation
bn-pass Nov 17, 2023
ba2d0e2
add a single indent
bn-pass Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const {
FEATURE_CONTACT_FORM_ATTACHMENTS_ENABLED,
FEATURE_MINT_PAGES_ENABLED,
FEATURE_NEXBOARD_ENABLED,
FEATURE_NEXBOARD_BUTTON_ENABLE,
SC_DEMO_USER_PASSWORD = 'Schulcloud1!',
SC_DEMO_USER_NAME = '[email protected]',
SC_SUPERHERO_USER_PASSWORD = 'Schulcloud1!',
Expand Down Expand Up @@ -73,6 +74,7 @@ const exp = {
FEATURE_CONTACT_FORM_ATTACHMENTS_ENABLED,
FEATURE_MINT_PAGES_ENABLED,
FEATURE_NEXBOARD_ENABLED,
FEATURE_NEXBOARD_BUTTON_ENABLE,
SC_DEMO_USER_PASSWORD,
SC_DEMO_USER_NAME,
SC_SUPERHERO_USER_PASSWORD,
Expand Down
4 changes: 2 additions & 2 deletions static/scripts/topicEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class TopicBlockList extends React.Component {
* Render the list items.
*/
render() {
const neXboardEnabled = ($contentBlocksContainer.data('nexboardenabled') === true);
const neXboardButtonEnabled = ($contentBlocksContainer.data('neXboardButtonEnabled') === false);
return (
<div>
<SortableList
Expand Down Expand Up @@ -371,7 +371,7 @@ class TopicBlockList extends React.Component {
onClick={this.addBlock.bind(this, TopicResources)}>
{`+ ${$t('topic.topicEdit.button.material')}`}
</button>
{neXboardEnabled ? <button
{neXboardButtonEnabled ? <button
type="button"
className="btn btn-secondary"
data-testid="topic-addcontent-nexboard-btn"
Expand Down
5 changes: 2 additions & 3 deletions views/topic/edit-topic.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@

<div class="form-group">
<label>{{$t "topic._topic.label.content" }}</label>

<!-- React Magic -->
<div id="content-blocks" data-value="{{lesson.contents}}" data-parent-id="{{lesson._id}}" data-school-id="{{schoolId}}" data-parent-type="lessons" data-etherpadbaseurl="{{etherpadBaseUrl}}"
data-iscoursegroup="{{courseGroupId}}" data-nexboardenabled="{{#ifEnv "FEATURE_NEXBOARD_ENABLED" "true"}}true{{/ifEnv}}"></div>
<div id="content-blocks" data-testid="nexboardButton" data-value="{{lesson.contents}}" data-parent-id="{{lesson._id}}" data-school-id="{{schoolId}}" data-parent-type="lessons" data-etherpadbaseurl="{{etherpadBaseUrl}}"
data-iscoursegroup="{{courseGroupId}}" data-neXboardButtonEnabled="{{#ifEnv "FEATURE_NEXBOARD_BUTTON_ENABLED" "false"}}true{{/ifEnv}}"></div>
</div>
{{#ifneq 0 (arrayLength @root.lessonFilesStorageData.files)}}
<label>{{$t "topic._topic.label.embeddedFiles" }}</label>
Expand Down