Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-diff --git a/.meteor/packages b/.meteor/packages
index cca744ee60f..3e290a89ae0 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -29,7 +29,6 @@ konecty:mongo-counter
konecty:multiple-instances-status
konecty:nrr
konecty:user-presence
-meteorhacks:kadira
mizzao:autocomplete
mizzao:timesync
momentjs:moment
@@ -59,3 +58,4 @@ tmeasday:errors
todda00:friendly-slugs
underscorestring:underscore.string
yasaricli:slugify
+meteorhacks:kadira
\ No newline at end of file
diff --git a/client/routes/router.coffee b/client/routes/router.coffee
index c8ffe2a4eff..54fd1630a64 100644
--- a/client/routes/router.coffee
+++ b/client/routes/router.coffee
@@ -64,16 +64,23 @@ Router.route '/home',
onAfterAction: ->
KonchatNotification.getDesktopPermission()
-Router.route '/settings',
+Router.route '/settings/:group?',
name: 'settings'
-
+ onBeforeAction: ->
+ if Meteor.user()?.admin isnt true
+ Router.go('home')
+ @next()
+ waitOn: ->
+ return Meteor.subscribe 'admin-settings'
+ data: ->
+ return {
+ group: if @params.group then @params.group else Settings.findOne({ type: 'group' })?._id
+ }
action: ->
this.render('settings')
-
onAfterAction: ->
KonchatNotification.getDesktopPermission()
-
Router.route '/room/:_id',
name: 'room'
diff --git a/client/views/app/settings.html b/client/views/app/settings.html
deleted file mode 100644
index cec3afd6c01..00000000000
--- a/client/views/app/settings.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
- Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
- {{_ "App_Settings"}}
-
-