Skip to content

Commit b845268

Browse files
authored
Merge branch 'development' into fix-8481
2 parents 41875f4 + fdf4ce0 commit b845268

File tree

6 files changed

+201
-246
lines changed

6 files changed

+201
-246
lines changed

app/routes/groups/edit/events.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,4 @@ export default class EventsRoute extends Route.extend(AuthenticatedRouteMixin) {
7878
groupEvents: group.query('events', {})
7979
});
8080
}
81-
82-
afterModel(model) {
83-
if (this.authManager.currentUser.email !== model.group.user.get('email') && !this.authManager.currentUser.isAdmin) {
84-
this.transitionTo('index');
85-
}
86-
}
8781
}

app/routes/groups/edit/followers.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,4 @@ export default class FollowersRoute extends Route.extend(EmberTableRouteMixin, A
5151
group
5252
};
5353
}
54-
55-
afterModel(model) {
56-
if (this.authManager.currentUser.email !== model.group.user.get('email') && !this.authManager.currentUser.isAdmin) {
57-
this.transitionTo('index');
58-
}
59-
}
6054
}

app/routes/groups/edit/settings.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,4 @@ export default class SettingsRoute extends Route.extend(AuthenticatedRouteMixin)
1717
})
1818
});
1919
}
20-
21-
afterModel(model) {
22-
if (this.authManager.currentUser.email !== model.group.user.get('email') && !this.authManager.currentUser.isAdmin) {
23-
this.transitionTo('index');
24-
}
25-
}
2620
}

app/routes/groups/team.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,4 @@ export default class TeamRoute extends Route.extend(AuthenticatedRouteMixin) {
1515
roles: await this.store.findAll('role')
1616
};
1717
}
18-
19-
afterModel(model) {
20-
if (this.authManager.currentUser.email !== model.group.user.get('email') && !this.authManager.currentUser.isAdmin) {
21-
this.transitionTo('index');
22-
}
23-
}
2418
}

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
]
2929
},
3030
"devDependencies": {
31-
"@babel/core": "^7.17.2",
32-
"@babel/plugin-proposal-object-rest-spread": "^7.16.7",
31+
"@babel/core": "^7.17.5",
32+
"@babel/plugin-proposal-object-rest-spread": "^7.17.3",
3333
"@babel/plugin-transform-block-scoping": "^7.16.7",
3434
"@ember/jquery": "^2.0.0",
3535
"@ember/optional-features": "^2.0.0",
3636
"@ember/render-modifiers": "^2.0.4",
3737
"@glimmer/component": "^1.0.4",
3838
"@glimmer/tracking": "^1.0.4",
3939
"@open-event/theme": "^0.2.2",
40-
"@sentry/browser": "^6.17.7",
41-
"@sentry/integrations": "^6.17.6",
42-
"@sentry/tracing": "^6.17.7",
40+
"@sentry/browser": "^6.17.9",
41+
"@sentry/integrations": "^6.17.9",
42+
"@sentry/tracing": "^6.17.9",
4343
"@types/ember": "^4.0.0",
4444
"@types/ember-data": "^3.16.15",
4545
"@types/ember-data__model": "^3.16.1",
@@ -50,15 +50,15 @@
5050
"@types/qunit": "^2.11.3",
5151
"@types/rsvp": "^4.0.4",
5252
"@types/url-parse": "^1.4.8",
53-
"@typescript-eslint/eslint-plugin": "^5.11.0",
54-
"@typescript-eslint/parser": "^5.11.0",
53+
"@typescript-eslint/eslint-plugin": "^5.12.0",
54+
"@typescript-eslint/parser": "^5.12.0",
5555
"async": "^3.2.3",
5656
"babel-eslint": "^10.1.0",
5757
"broccoli-asset-rev": "^3.0.0",
5858
"broccoli-persistent-filter": "^3.1.2",
5959
"croppie": "^2.6.5",
6060
"css-loader": "^5.2.7",
61-
"dompurify": "^2.3.5",
61+
"dompurify": "^2.3.6",
6262
"ember-ajax": "5.1.1",
6363
"ember-auto-import": "^1.11.3",
6464
"ember-classic-decorator": "^3.0.0",
@@ -128,15 +128,15 @@
128128
"ember-resolver": "^8.0.3",
129129
"ember-route-action-helper": "^2.0.8",
130130
"ember-router-scroll": "^3.3.7",
131-
"ember-simple-auth": "^4.1.1",
131+
"ember-simple-auth": "^4.2.0",
132132
"ember-simple-auth-token": "^5.3.0",
133133
"ember-source": "3.20.3",
134134
"ember-table": "^2.2.3",
135135
"ember-template-lint": "^2.21.0",
136136
"ember-truth-helpers": "^3.0.0",
137137
"ember-uuid": "^2.1.0",
138138
"eslint": "^7.32.0",
139-
"eslint-plugin-ember": "^10.5.8",
139+
"eslint-plugin-ember": "^10.5.9",
140140
"eslint-plugin-ember-suave": "^2.0.1",
141141
"eslint-plugin-node": "^11.1.0",
142142
"fastboot-app-server": "^3.2.0",
@@ -148,20 +148,20 @@
148148
"mini-css-extract-plugin": "^2.5.3",
149149
"moment-timezone": "^0.5.31",
150150
"npm-run-all": "^4.1.5",
151-
"object-to-formdata": "^4.4.1",
151+
"object-to-formdata": "^4.4.2",
152152
"paypal-checkout": "^4.0.334",
153153
"pre-commit": "^1.2.2",
154154
"query-string": "^7.1.1",
155155
"qunit-dom": "^2.0.0",
156-
"sass": "^1.49.7",
156+
"sass": "^1.49.8",
157157
"semantic-ui-calendar": "^0.0.8",
158158
"semantic-ui-ember": "3.0.5",
159159
"string_decoder": "^1.3.0",
160160
"style-loader": "^2.0.0",
161161
"tinyColorPicker": "https://github.com/PitPik/tinyColorPicker#1.1.1",
162162
"torii": "^0.10.1",
163163
"typescript": "^4.5.5",
164-
"url-parse": "^1.5.4",
164+
"url-parse": "^1.5.7",
165165
"webpack-bundle-analyzer": "^4.5.0",
166166
"wysihtml": "^0.5.5",
167167
"xgettext-template": "^4.1.1"
@@ -172,7 +172,7 @@
172172
},
173173
"private": true,
174174
"dependencies": {
175-
"@stripe/stripe-js": "^1.22.0",
175+
"@stripe/stripe-js": "^1.23.0",
176176
"ua-parser-js": "^1.0.2"
177177
},
178178
"ember": {

0 commit comments

Comments
 (0)