add notification.

nodeloc · Feb 2, 2024 · 7230e23 · 7230e23
1 parent f89c9d7
commit 7230e23
Show file tree

Hide file tree

Showing 20 changed files with 199 additions and 70 deletions.
diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/admin/index.ts b/js/src/admin/index.ts
@@ -24,8 +24,8 @@ app.initializers.add('nodeloc/lottery', () => {
     .registerPermission(
       {
         icon: 'fas fa-signal',
-        label: app.translator.trans('nodeloc-lottery.admin.permissions.view_results_without_Enter'),
-        permission: 'discussion.lottery.viewResultsWithoutEnter',
+        label: app.translator.trans('nodeloc-lottery.admin.permissions.seeParticipants'),
+        permission: 'lottery.seeParticipants',
         allowGuest: true,
       },
       'view'

diff --git a/js/src/forum/components/CreateLotteryModal.js b/js/src/forum/components/CreateLotteryModal.js
@@ -12,9 +12,9 @@ export default class CreateLotteryModal extends Modal {
   oninit(vnode) {
     super.oninit(vnode);
 
-    this.operator_type = [Stream('money')];
+    this.operator_type = [Stream('discussions_started')];
     this.operator = [Stream('1')];
-    this.operator_value = [Stream('100')];
+    this.operator_value = [Stream('1')];
 
     this.prizes = Stream('');
     this.price = Stream('');
@@ -257,9 +257,9 @@ export default class CreateLotteryModal extends Modal {
     const max = 5;
 
     if (this.operator_value.length < max) {
-      this.operator_type.push(Stream(''));
+      this.operator_type.push(Stream('money'));
       this.operator.push(Stream('1'));
-      this.operator_value.push(Stream(''));
+      this.operator_value.push(Stream('1'));
     } else {
       alert(extractText(app.translator.trans('nodeloc-lottery.forum.modal.max', {max})));
     }

diff --git a/js/src/forum/components/EditLotteryModal.js b/js/src/forum/components/EditLotteryModal.js
@@ -33,7 +33,6 @@ export default class EditLotteryModal extends CreateLotteryModal {
   }
 
   displayOptions() {
-    console.log('options',this.options);
     return this.options.map((options, i) => (
         <div className="Form-group MinMaxSelector">
           <fieldset className="MinMaxSelector--inputs">
@@ -81,6 +80,7 @@ export default class EditLotteryModal extends CreateLotteryModal {
       this.operator_type.push(Stream(''));
       this.operator.push(Stream(''));
       this.operator_value.push(Stream(''));
+      this.displayOptions();
     } else {
       alert(extractText(app.translator.trans('nodeloc-lottery.forum.modal.max', {max})));
     }

diff --git a/js/src/forum/components/ListLotteryModal.js b/js/src/forum/components/ListLotteryModal.js
@@ -24,7 +24,7 @@ export default class ListLotteryModal extends Modal {
   }
 
   title() {
-    return app.translator.trans('nodeloc-lottery.forum.participants_modal.title');
+    return app.translator.trans('nodeloc-lottery.forum.participants_modal.title' + (this.attrs.lottery.hasEnded() ? '_winners':''));
   }
 
   content() {
@@ -33,10 +33,8 @@ export default class ListLotteryModal extends Modal {
 
   optionContent() {
     const participants = this.attrs.lottery.participants();
-
     return (
         <div className="VotesModal-option">
-          <h2>Participants:</h2>
           {participants.length ? (
               <div className="VotesModal-list">{participants.map(this.participantsContent.bind(this))}</div>
           ) : (
@@ -45,9 +43,12 @@ export default class ListLotteryModal extends Modal {
         </div>
     );
   }
-
   participantsContent(participants) {
     const user = participants.user();
+    // 只在 hasEnded 为 true 时显示 status=1 的用户
+    if (this.attrs.lottery.hasEnded() && participants.status() !== 1) {
+      return null;
+    }
     const attrs = user && { href: app.route.user(user) };
 
     return (