Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #250 from abf/rosa-build:fix-AngularJS-back-button 

AngularJS && BackButton
This commit is contained in:
avm 2013-08-01 13:46:08 +04:00
parent 3f5ee7701c 0db4013bb3
commit 5435226d66
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/angularjs/services/project.js vendored
View File

@ -1,31 +1,31 @@
RosaABF.factory("ApiProject", ['$resource', function($resource) { RosaABF.factory("ApiProject", ['$resource', function($resource) {
var ProjectResource = $resource( var ProjectResource = $resource(
'/:owner/:project', '/:owner/:project?format=json',
{owner: '@project.owner.uname', project: '@project.name'}, {owner: '@project.owner.uname', project: '@project.name'},
{ {
tags: { tags: {
url: '/:owner/:project/tags', url: '/:owner/:project/tags.json',
method: 'GET', method: 'GET',
isArray : false isArray : false
}, },
branches: { branches: {
url: '/:owner/:project/branches', url: '/:owner/:project/branches.json',
method: 'GET', method: 'GET',
isArray : false isArray : false
}, },
delete_branch: { delete_branch: {
url: '/:owner/:project/branches/:ref', url: '/:owner/:project/branches/:ref.json',
method: 'DELETE', method: 'DELETE',
isArray : false isArray : false
}, },
restore_branch: { restore_branch: {
url: '/:owner/:project/branches/:ref', // ?sha=<sha> url: '/:owner/:project/branches/:ref.json', // ?sha=<sha>
method: 'PUT', method: 'PUT',
isArray : false isArray : false
}, },
create_branch: { create_branch: {
url: '/:owner/:project/branches', // ?new_ref=<new_ref>&from_ref=<from_ref> url: '/:owner/:project/branches.json', // ?new_ref=<new_ref>&from_ref=<from_ref>
method: 'POST', method: 'POST',
isArray : false isArray : false
} }

4
app/assets/javascripts/angularjs/services/pull_request.js vendored
View File

@ -1,7 +1,7 @@
RosaABF.factory("ApiPullRequest", ['$resource', function($resource) { RosaABF.factory("ApiPullRequest", ['$resource', function($resource) {
var PullRequestResource = $resource( var PullRequestResource = $resource(
'/:owner/:project/pull_requests/:serial_id', '/:owner/:project/pull_requests/:serial_id.json',
{ {
owner: '@pull_request.to_ref.project.owner_uname', owner: '@pull_request.to_ref.project.owner_uname',
project: '@pull_request.to_ref.project.name', project: '@pull_request.to_ref.project.name',
@ -13,7 +13,7 @@ RosaABF.factory("ApiPullRequest", ['$resource', function($resource) {
isArray : false isArray : false
}, },
merge: { merge: {
url: '/:owner/:project/pull_requests/:serial_id/merge', url: '/:owner/:project/pull_requests/:serial_id/merge.json',
method: 'PUT', method: 'PUT',
isArray: false isArray: false
} }