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

Merge pull request #435 from taigaio/issue/2542/taiga-admin-crashes-with-some-kind-of-plugins 

Fixing admin contrib section when there is only an auth plugin or it's t...
stable
David Barragán Merino 2015-04-15 11:42:49 +02:00
parent 0f0827a690 1f8c692cc4
commit 5d7ae66dab
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

@ -246,6 +246,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
init = ($log, $config, $rootscope, $auth, $events, $analytics, $translate) ->
$log.debug("Initialize application")
$rootscope.contribPlugins = @.taigaContribPlugins
$rootscope.adminPlugins = _.where(@.taigaContribPlugins, {"type": "admin"})
if $auth.isAuthenticated()
$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"]
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.projectSlug = @params.pslug
@scope.adminPlugins = _.where(@rootScope.contribPlugins, {"type": "admin"})
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")
span.title(translate="ADMIN.MENU.INTEGRATIONS")
span.icon.icon-arrow-right
li#adminmenu-contrib(ng-show="contribPlugins.length > 0")
a(href="" tg-nav="project-admin-contrib:project=project.slug,plugin=contribPlugins[0].slug")
li#adminmenu-contrib(ng-show="adminPlugins.length > 0")
a(href="" tg-nav="project-admin-contrib:project=project.slug,plugin=adminPlugins[0].slug")
span.title(translate="COMMON.PLUGINS")
span.icon.icon-arrow-right