Merge branch 'stable' into update-user-list

Author: LeonVreling

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [1.42.15](https://github.com/AEGEE/frontend/compare/1.42.14...1.42.15) (2025-03-17)
+
+
+### Bug Fixes
+
+* **resources:** update resource page with Code of Conduct ([#2326](https://github.com/AEGEE/frontend/issues/2326)) ([1d1a0f6](https://github.com/AEGEE/frontend/commit/1d1a0f64abb758c1833b694869c049b47a7cedbd))
+
+## [1.42.14](https://github.com/AEGEE/frontend/compare/1.42.13...1.42.14) (2025-03-16)
+
+
+### Bug Fixes
+
+* only show menu items with proper permissions. Fixes HELP-2691 ([#2321](https://github.com/AEGEE/frontend/issues/2321)) ([89c44f8](https://github.com/AEGEE/frontend/commit/89c44f85cf85e0e9953c8b2ed433c6efcdd0f1ee))
+
+## [1.42.13](https://github.com/AEGEE/frontend/compare/1.42.12...1.42.13) (2025-03-16)
+
+
+### Bug Fixes
+
+* **network:** use NetCom GSuite accounts if it is set ([#2325](https://github.com/AEGEE/frontend/issues/2325)) ([ee546ee](https://github.com/AEGEE/frontend/commit/ee546ee05403ce1e076c056a4931aba006b6353f))
+
+## [1.42.12](https://github.com/AEGEE/frontend/compare/1.42.11...1.42.12) (2025-03-14)
+
+
+### Bug Fixes
+
+* **network:** fix rounding error with fee payment automatic AC check ([#2324](https://github.com/AEGEE/frontend/issues/2324)) ([60a29f4](https://github.com/AEGEE/frontend/commit/60a29f42db11a48df0658ccc05bcdaa958346915))
+
+## [1.42.11](https://github.com/AEGEE/frontend/compare/1.42.10...1.42.11) (2025-03-10)
+
+
+### Bug Fixes
+
+* **network:** add check for body in ac check page ([#2322](https://github.com/AEGEE/frontend/issues/2322)) ([6143d7b](https://github.com/AEGEE/frontend/commit/6143d7bd4362e3394e57295705b418629d0b6d49))
+
 ## [1.42.10](https://github.com/AEGEE/frontend/compare/1.42.9...1.42.10) (2025-02-21)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.42.10",
+  "version": "1.42.15",
   "description": "MyAEGEE Frontend",
   "homepage": "https://my.aegee.eu",
   "license": "MIT",

package.json

@@ -80,11 +80,13 @@
         "children": [
           {
             "name": "oms.events.change_status",
-            "label": "Change event status"
+            "label": "Change event status",
+            "permissions": ["global:approve_event:nwm", "global:approve_event:training", "global:approve_event:conference", "global:approve_event:cultural"]
           },
           {
             "name": "oms.events.boardview",
-            "label": "Board view"
+            "label": "Board view",
+            "permissions": ["local:approve_members:events"]
           }
         ]
       },
@@ -132,7 +134,8 @@
           },
           {
             "name": "oms.summeruniversity.boardview",
-            "label": "Board view"
+            "label": "Board view",
+            "permissions": ["local:approve_members:summeruniversity"]
           }
         ]
       },

src/menu.json

@@ -373,7 +373,9 @@ export default {
       await this.axios.get(this.services['network'] + '/boards/recents', { params: { ends: this.selectedAgora.ends } }).then((boardsResponse) => {
         for (const board of boardsResponse.data.data) {
           const body = this.bodies.find(x => x.id === board.body_id)
-          this.$set(body, 'latestElection', board.latest_election)
+          if (body) {
+            this.$set(body, 'latestElection', board.latest_election)
+          }
         }
 
         // Check if the current board was elected within the past year
@@ -394,7 +396,7 @@ export default {
           const body = this.bodies.find(x => x.id === membersList.body_id)
           this.$set(body.antennaCriteria, 'membersList', 'true')
 
-          if (membersList.fee_not_paid === 0) {
+          if (membersList.fee_not_paid <= 0) {
             this.$set(body.antennaCriteria, 'membershipFee', 'true')
           }
         }
@@ -424,7 +426,7 @@ export default {
           this.netcommies = netcomMembersResponse.data.data.map(netcommie => ({
             user_id: netcommie.user_id,
             first_name: netcommie.user.first_name,
-            email: netcommie.user.email
+            email: netcommie.user.gsuite_id ? netcommie.user.gsuite_id : netcommie.user.email
           }))
           this.netcommies.push({ 'user_id': 0, 'first_name': 'Not set', 'email': '' })
         })

src/views/network/AntennaCriteriaCheck.vue

@@ -114,27 +114,27 @@ export default {
             color: '#FFDB4C'
           },
           {
-            url: 'https://forms.gle/EcaDkdyQfSb65Jdh8',
-            title: 'Safe Person Committee',
-            description: 'Request a Safe Person or workshop for your event',
+            url: 'https://forms.gle/s8vE6b9wrEHqV1xe9',
+            title: 'AEGEE House Guest Request',
+            description: 'Visiting the AEGEE house',
             color: '#FFDB4C'
           },
           {
-            url: 'https://podio.com/webforms/2318137/167577',
-            title: 'AEGEE Newsletter',
-            description: 'Submitting content for the AEGEE newsletter',
+            url: 'https://forms.gle/ZMfSByo5QEUAwoY4A',
+            title: 'ASRF Application Form',
+            description: 'Apply for the AEGEE Social Responsibility Fund',
             color: '#FFDB4C'
           },
           {
-            url: 'https://forms.gle/s8vE6b9wrEHqV1xe9',
-            title: 'CD House Guest Request',
-            description: 'Visiting the CD house',
+            url: 'https://www.aegee.org/code-of-conduct/',
+            title: 'Code of Conduct',
+            description: 'Read AEGEE\'s Code of Conduct',
             color: '#FFDB4C'
           },
           {
-            url: 'https://forms.gle/ZMfSByo5QEUAwoY4A',
-            title: 'ASRF Application Form',
-            description: 'Apply for the AEGEE Social Responsibility Fund',
+            url: 'https://forms.gle/EcaDkdyQfSb65Jdh8',
+            title: 'Safe Person Committee',
+            description: 'Request a Safe Person or workshop for your event',
             color: '#FFDB4C'
           },
           {