taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Backport] Fixing admin contrib section when there is only an auth plugin or it's the first one

stable
Alejandro Alonso 2015-04-15 08:36:26 +02:00 committed by David Barragán Merino
parent f90f08e9e5
commit 0893d6107f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/coffee/app.coffee
View File

@ -240,6 +240,7 @@ init = ($log, $i18n, $config, $rootscope, $auth, $events, $analytics) ->
$i18n.initialize($config.get("defaultLanguage")) $i18n.initialize($config.get("defaultLanguage"))
$log.debug("Initialize application") $log.debug("Initialize application")
$rootscope.contribPlugins = @.taigaContribPlugins $rootscope.contribPlugins = @.taigaContribPlugins
$rootscope.adminPlugins = _.where(@.taigaContribPlugins, {"type": "admin"})
if $auth.isAuthenticated() if $auth.isAuthenticated()
$events.setupConnection() $events.setupConnection()

4
app/coffee/modules/base/contrib.coffee
View File

@ -25,10 +25,10 @@ class ContribController extends taiga.Controller
@.$inject = ["$rootScope", "$scope", "$routeParams", "$tgRepo", "$tgResources", "$tgConfirm", "$appTitle"] @.$inject = ["$rootScope", "$scope", "$routeParams", "$tgRepo", "$tgResources", "$tgConfirm", "$appTitle"]
constructor: (@rootScope, @scope, @params, @repo, @rs, @confirm, @appTitle) -> constructor: (@rootScope, @scope, @params, @repo, @rs, @confirm, @appTitle) ->
@scope.currentPlugin = _.first(_.where(taigaContribPlugins, {"slug": @params.plugin})) @scope.adminPlugins = _.where(@rootScope.contribPlugins, {"type": "admin"})
@scope.currentPlugin = _.first(_.where(@scope.adminPlugins, {"slug": @params.plugin}))
@scope.pluginTemplate = "contrib/#{@scope.currentPlugin.slug}" @scope.pluginTemplate = "contrib/#{@scope.currentPlugin.slug}"
@scope.projectSlug = @params.pslug @scope.projectSlug = @params.pslug
@scope.adminPlugins = _.where(@rootScope.contribPlugins, {"type": "admin"})
promise = @.loadInitialData() promise = @.loadInitialData()

4
app/partials/includes/modules/admin-menu.jade
View File

@ -24,7 +24,7 @@ section.admin-menu
a(href="" tg-nav="project-admin-third-parties-webhooks:project=project.slug") a(href="" tg-nav="project-admin-third-parties-webhooks:project=project.slug")
span.title Integrations span.title Integrations
span.icon.icon-arrow-right span.icon.icon-arrow-right
li#adminmenu-contrib(ng-show="contribPlugins.length > 0") li#adminmenu-contrib(ng-show="adminPlugins.length > 0")
a(href="" tg-nav="project-admin-contrib:project=project.slug,plugin=contribPlugins[0].slug") a(href="" tg-nav="project-admin-contrib:project=project.slug,plugin=adminPlugins[0].slug")
span.title Plugins span.title Plugins
span.icon.icon-arrow-right span.icon.icon-arrow-right