From 4c13a8458bd489e700577ddea2e6113af3477d99 Mon Sep 17 00:00:00 2001 From: Morlinest Date: Sat, 19 Aug 2017 03:37:48 +0200 Subject: [PATCH] Fix repo-search template errors for go1.7 (#2336) --- public/js/index.js | 1 - templates/user/dashboard/dashboard.tmpl | 85 ++++++++++++++++++++++- templates/user/dashboard/repo-search.tmpl | 81 --------------------- 3 files changed, 82 insertions(+), 85 deletions(-) delete mode 100644 templates/user/dashboard/repo-search.tmpl diff --git a/public/js/index.js b/public/js/index.js index 169563a4ec..f6060dc631 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1660,7 +1660,6 @@ function initVueComponents(){ Vue.component('repo-search', { delimiters: vueDelimeters, - template: '#repo-search-template', props: { searchLimit: { diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 9135d117b7..6513fecc5e 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -8,10 +8,89 @@ {{template "user/dashboard/feeds" .}}
- -
+ +
+ {{if not .ContextUser.IsOrganization}} + + {{end}} + + + {{if not .ContextUser.IsOrganization}} +
+

+ {{.i18n.Tr "home.my_orgs"}} {{.ContextUser.GetOrganizationCount}} +
+ {{if .SignedUser.CanCreateOrganization}} + + + {{.i18n.Tr "new_org"}} + + {{end}} +
+

+
+ +
+
+ {{end}} +
+ +
-{{template "user/dashboard/repo-search" .}} {{template "base/footer" .}} diff --git a/templates/user/dashboard/repo-search.tmpl b/templates/user/dashboard/repo-search.tmpl deleted file mode 100644 index 6b8bde5865..0000000000 --- a/templates/user/dashboard/repo-search.tmpl +++ /dev/null @@ -1,81 +0,0 @@ - \ No newline at end of file