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

Fix comaptibility with new config.

stable
Andrey Antukh 2014-10-08 12:00:15 +02:00
parent f8c1740744
commit 03ef9aec42
2 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/coffee/modules/base/urls.coffee
View File

@ -30,8 +30,7 @@ class UrlsService extends taiga.Service
constructor: (@config) -> constructor: (@config) ->
@.urls = {} @.urls = {}
@.host = config.get("host") @.mainUrl = config.get("api")
@.scheme = config.get("scheme")
update: (urls) -> update: (urls) ->
@.urls = _.merge(@.urls, urls) @.urls = _.merge(@.urls, urls)
@ -44,7 +43,11 @@ class UrlsService extends taiga.Service
name = args.slice(0, 1)[0] name = args.slice(0, 1)[0]
url = format(@.urls[name], args.slice(1)) url = format(@.urls[name], args.slice(1))
return format("%s://%s%s", [@.scheme, @.host, url])
return format("%s/%s", [
_.str.rtrim(@.mainUrl, "/"),
_.str.ltrim(url, "/")
])
module = angular.module("taigaBase") module = angular.module("taigaBase")

134
app/coffee/modules/resources.coffee
View File

@ -24,79 +24,79 @@ taiga = @.taiga
class ResourcesService extends taiga.Service class ResourcesService extends taiga.Service
urls = { urls = {
"auth": "/api/v1/auth" "auth": "/auth"
"auth-register": "/api/v1/auth/register" "auth-register": "/auth/register"
"invitations": "/api/v1/invitations" "invitations": "/invitations"
"permissions": "/api/v1/permissions" "permissions": "/permissions"
"roles": "/api/v1/roles" "roles": "/roles"
"projects": "/api/v1/projects" "projects": "/projects"
"memberships": "/api/v1/memberships" "memberships": "/memberships"
"notify-policies": "/api/v1/notify-policies" "notify-policies": "/notify-policies"
"bulk-create-memberships": "/api/v1/memberships/bulk_create" "bulk-create-memberships": "/memberships/bulk_create"
"milestones": "/api/v1/milestones" "milestones": "/milestones"
"userstories": "/api/v1/userstories" "userstories": "/userstories"
"bulk-create-us": "/api/v1/userstories/bulk_create" "bulk-create-us": "/userstories/bulk_create"
"bulk-update-us-backlog-order": "/api/v1/userstories/bulk_update_backlog_order" "bulk-update-us-backlog-order": "/userstories/bulk_update_backlog_order"
"bulk-update-us-sprint-order": "/api/v1/userstories/bulk_update_sprint_order" "bulk-update-us-sprint-order": "/userstories/bulk_update_sprint_order"
"bulk-update-us-kanban-order": "/api/v1/userstories/bulk_update_kanban_order" "bulk-update-us-kanban-order": "/userstories/bulk_update_kanban_order"
"userstories-restore": "/api/v1/userstories/%s/restore" "userstories-restore": "/userstories/%s/restore"
"tasks": "/api/v1/tasks" "tasks": "/tasks"
"bulk-create-tasks": "/api/v1/tasks/bulk_create" "bulk-create-tasks": "/tasks/bulk_create"
"tasks-restore": "/api/v1/tasks/%s/restore" "tasks-restore": "/tasks/%s/restore"
"issues": "/api/v1/issues" "issues": "/issues"
"bulk-create-issues": "/api/v1/issues/bulk_create" "bulk-create-issues": "/issues/bulk_create"
"issues-restore": "/api/v1/issues/%s/restore" "issues-restore": "/issues/%s/restore"
"wiki": "/api/v1/wiki" "wiki": "/wiki"
"wiki-restore": "/api/v1/wiki/%s/restore" "wiki-restore": "/wiki/%s/restore"
"wiki-links": "/api/v1/wiki-links" "wiki-links": "/wiki-links"
"choices/userstory-statuses": "/api/v1/userstory-statuses" "choices/userstory-statuses": "/userstory-statuses"
"choices/userstory-statuses/bulk-update-order": "/api/v1/userstory-statuses/bulk_update_order" "choices/userstory-statuses/bulk-update-order": "/userstory-statuses/bulk_update_order"
"choices/points": "/api/v1/points" "choices/points": "/points"
"choices/points/bulk-update-order": "/api/v1/points/bulk_update_order" "choices/points/bulk-update-order": "/points/bulk_update_order"
"choices/task-statuses": "/api/v1/task-statuses" "choices/task-statuses": "/task-statuses"
"choices/task-statuses/bulk-update-order": "/api/v1/task-statuses/bulk_update_order" "choices/task-statuses/bulk-update-order": "/task-statuses/bulk_update_order"
"choices/issue-statuses": "/api/v1/issue-statuses" "choices/issue-statuses": "/issue-statuses"
"choices/issue-statuses/bulk-update-order": "/api/v1/issue-statuses/bulk_update_order" "choices/issue-statuses/bulk-update-order": "/issue-statuses/bulk_update_order"
"choices/issue-types": "/api/v1/issue-types" "choices/issue-types": "/issue-types"
"choices/issue-types/bulk-update-order": "/api/v1/issue-types/bulk_update_order" "choices/issue-types/bulk-update-order": "/issue-types/bulk_update_order"
"choices/priorities": "/api/v1/priorities" "choices/priorities": "/priorities"
"choices/priorities/bulk-update-order": "/api/v1/priorities/bulk_update_order" "choices/priorities/bulk-update-order": "/priorities/bulk_update_order"
"choices/severities": "/api/v1/severities" "choices/severities": "/severities"
"choices/severities/bulk-update-order": "/api/v1/severities/bulk_update_order" "choices/severities/bulk-update-order": "/severities/bulk_update_order"
"search": "/api/v1/search" "search": "/search"
"sites": "/api/v1/sites" "sites": "/sites"
"project-templates": "/api/v1/project-templates" "project-templates": "/project-templates"
"site-members": "/api/v1/site-members" "site-members": "/site-members"
"site-projects": "/api/v1/site-projects" "site-projects": "/site-projects"
"users": "/api/v1/users" "users": "/users"
"users-password-recovery": "/api/v1/users/password_recovery" "users-password-recovery": "/users/password_recovery"
"users-change-password-from-recovery": "/api/v1/users/change_password_from_recovery" "users-change-password-from-recovery": "/users/change_password_from_recovery"
"users-change-password": "/api/v1/users/change_password" "users-change-password": "/users/change_password"
"users-change-email": "/api/v1/users/change_email" "users-change-email": "/users/change_email"
"user-storage": "/api/v1/user-storage" "user-storage": "/user-storage"
"resolver": "/api/v1/resolver" "resolver": "/resolver"
"userstory-statuses": "/api/v1/userstory-statuses" "userstory-statuses": "/userstory-statuses"
"points": "/api/v1/points" "points": "/points"
"task-statuses": "/api/v1/task-statuses" "task-statuses": "/task-statuses"
"issue-statuses": "/api/v1/issue-statuses" "issue-statuses": "/issue-statuses"
"issue-types": "/api/v1/issue-types" "issue-types": "/issue-types"
"priorities": "/api/v1/priorities" "priorities": "/priorities"
"severities": "/api/v1/severities" "severities": "/severities"
# History # History
"history/us": "/api/v1/history/userstory" "history/us": "/history/userstory"
"history/issue": "/api/v1/history/issue" "history/issue": "/history/issue"
"history/task": "/api/v1/history/task" "history/task": "/history/task"
"history/wiki": "/api/v1/history/wiki" "history/wiki": "/history/wiki"
# Attachments # Attachments
"attachments/us": "/api/v1/userstories/attachments" "attachments/us": "/userstories/attachments"
"attachments/issue": "/api/v1/issues/attachments" "attachments/issue": "/issues/attachments"
"attachments/task": "/api/v1/tasks/attachments" "attachments/task": "/tasks/attachments"
"attachments/wiki_page": "/api/v1/wiki/attachments" "attachments/wiki_page": "/wiki/attachments"
# Feedback # Feedback
"feedback": "/api/v1/feedback" "feedback": "/feedback"
} }
# Initialize api urls service # Initialize api urls service