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

Refactor tg-nav urls

stable
Álex Hermida 2018-11-22 17:52:35 +01:00 committed by Alex Hermida
parent 89341fe404
commit 050d694ed1
10 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/coffee/modules/base/navurls.coffee
View File

@ -54,7 +54,7 @@ module.service("$tgNavUrls", NavigationUrlsService)
## Navigation Urls Directive ## Navigation Urls Directive
############################################################################# #############################################################################
NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) -> NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService, tgSections) ->
# Example: # Example:
# link(tg-nav="project-backlog:project='sss',") # link(tg-nav="project-backlog:project='sss',")
@ -118,7 +118,13 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) ->
user = $auth.getUser() user = $auth.getUser()
options.user = user.username if user options.user = user.username if user
if options['section']
sections = tgSections.list()
section = _.find(sections, {"id": options['section']})
name = "#{name}-#{section.path}"
url = $navurls.resolve(name) url = $navurls.resolve(name)
fullUrl = $navurls.formatUrl(url, options) fullUrl = $navurls.formatUrl(url, options)
if $attrs.tgNavGetParams if $attrs.tgNavGetParams
@ -159,4 +165,5 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) ->
return {link: link} return {link: link}
module.directive("tgNav", ["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", "lightboxService", NavigationUrlsDirective]) module.directive("tgNav",
["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", "lightboxService", "$tgSections", NavigationUrlsDirective])

4
app/modules/discover/components/featured-projects/featured-projects.jade
View File

@ -13,7 +13,7 @@
.project-card-header .project-card-header
a.project-card-logo( a.project-card-logo(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) )
img( img(
@ -23,7 +23,7 @@
h2.project-card-name h2.project-card-name
a( a(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) {{::project.get('name')}} ) {{::project.get('name')}}
tg-svg.look-for-people( tg-svg.look-for-people(

4
app/modules/discover/components/highlighted/highlighted.jade
View File

@ -9,7 +9,7 @@
) )
a.project-logo( a.project-logo(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) )
img( img(
@ -21,7 +21,7 @@
h2.project-title h2.project-title
a( a(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) {{::project.get('name')}} ) {{::project.get('name')}}
tg-svg.look-for-people( tg-svg.look-for-people(

4
app/modules/discover/discover-search/discover-search.jade
View File

@ -29,7 +29,7 @@ div(tg-discover-search)
.list-itemtype-project-left .list-itemtype-project-left
a.list-itemtype-project-image( a.list-itemtype-project-image(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) )
img( img(
@ -40,7 +40,7 @@ div(tg-discover-search)
h2 h2
a( a(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) {{project.get('name')}} ) {{project.get('name')}}
tg-svg.look-for-people( tg-svg.look-for-people(

6
app/modules/home/projects/home-project-list.jade
View File

@ -7,12 +7,12 @@ section.home-project-list(ng-if="vm.projects.size")
) )
.project-card-inner( .project-card-inner(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
) )
.project-card-header .project-card-header
a.project-card-logo( a.project-card-logo(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) )
img( img(
@ -22,7 +22,7 @@ section.home-project-list(ng-if="vm.projects.size")
h3.project-card-name h3.project-card-name
a.project-title( a.project-title(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) {{::project.get('name')}} ) {{::project.get('name')}}

2
app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade
View File

@ -11,7 +11,7 @@ div.navbar-dropdown.dropdown-project-list
li(tg-repeat="project in vm.projects track by project.get('id')") li(tg-repeat="project in vm.projects track by project.get('id')")
a( a(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
ng-class="{'blocked-project': project.get('blocked_code')}" ng-class="{'blocked-project': project.get('blocked_code')}"
) )
span {{::project.get("name")}} span {{::project.get("name")}}

4
app/modules/profile/profile-favs/items/project.jade
View File

@ -3,7 +3,7 @@
.list-itemtype-project-data-wrapper .list-itemtype-project-data-wrapper
a.list-itemtype-project-image( a.list-itemtype-project-image(
href="#" href="#"
tg-nav="project:project=vm.item.get('slug')" tg-nav="project:project=vm.item.get('slug'),section=vm.item.get('my_homepage')"
title="{{ ::vm.item.get('name') }}" title="{{ ::vm.item.get('name') }}"
) )
img( img(
@ -15,7 +15,7 @@
h2 h2
a.list-itemtype-project-name( a.list-itemtype-project-name(
href="#" href="#"
tg-nav="project:project=vm.item.get('slug')" tg-nav="project:project=vm.item.get('slug'),section=vm.item.get('my_homepage')"
title="{{ ::vm.item.get('name') }}" title="{{ ::vm.item.get('name') }}"
) {{ ::vm.item.get('name') }} ) {{ ::vm.item.get('name') }}

4
app/modules/profile/profile-projects/profile-projects.jade
View File

@ -18,7 +18,7 @@ section.profile-projects
.project-list-single-title-wrapper .project-list-single-title-wrapper
a.list-itemtype-project-image( a.list-itemtype-project-image(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) )
img( img(
@ -29,7 +29,7 @@ section.profile-projects
h2 h2
a.project-title( a.project-title(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) {{::project.get('name')}} ) {{::project.get('name')}}

4
app/modules/projects/listing/projects-listing.jade
View File

@ -22,7 +22,7 @@
.list-itemtype-project-data-wrapper .list-itemtype-project-data-wrapper
a.list-itemtype-project-image( a.list-itemtype-project-image(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) )
img( img(
@ -33,7 +33,7 @@
h2 h2
a.project-title( a.project-title(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{ ::project.get('name') }}" title="{{ ::project.get('name') }}"
) {{project.get('name')}} ) {{project.get('name')}}
tg-svg( tg-svg(

2
app/modules/projects/project/project.jade
View File

@ -4,7 +4,7 @@ div.wrapper
section.single-project-intro section.single-project-intro
.project-logo( .project-logo(
href="#" href="#"
tg-nav="project:project=project.get('slug')" tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')"
title="{{::project.get('name')}}" title="{{::project.get('name')}}"
) )
img( img(