|
1 |
| -/*! forms-angular 2015-02-15 */ |
| 1 | +/*! forms-angular 2015-02-16 */ |
2 | 2 | 'use strict';
|
3 | 3 |
|
4 | 4 | var formsAngular = angular.module('formsAngular', [
|
@@ -1181,19 +1181,20 @@ formsAngular.provider('routingService', [ '$injector', '$locationProvider', func
|
1181 | 1181 | });
|
1182 | 1182 | }
|
1183 | 1183 |
|
1184 |
| - function _buildOperationUrl(prefix, operation, modelName, formName, id) { |
| 1184 | + function _buildOperationUrl(prefix, operation, modelName, formName, id, tabName) { |
1185 | 1185 | var formString = formName ? ('/' + formName) : '';
|
1186 | 1186 | var modelString = prefix + '/' + modelName;
|
| 1187 | + var tabString = tabName ? ('/' + tabName) : ''; |
1187 | 1188 | var urlStr;
|
1188 | 1189 | switch (operation) {
|
1189 | 1190 | case 'list' :
|
1190 | 1191 | urlStr = modelString + formString;
|
1191 | 1192 | break;
|
1192 | 1193 | case 'edit' :
|
1193 |
| - urlStr = modelString + formString + '/' + id + '/edit'; |
| 1194 | + urlStr = modelString + formString + '/' + id + '/edit' + tabString; |
1194 | 1195 | break;
|
1195 | 1196 | case 'new' :
|
1196 |
| - urlStr = modelString + formString + '/new'; |
| 1197 | + urlStr = modelString + formString + '/new' + tabString; |
1197 | 1198 | break;
|
1198 | 1199 | }
|
1199 | 1200 | return urlStr;
|
@@ -1328,18 +1329,18 @@ formsAngular.provider('routingService', [ '$injector', '$locationProvider', func
|
1328 | 1329 | url += (path[0] === '/' ? path.slice(1) : path);
|
1329 | 1330 | return url;
|
1330 | 1331 | },
|
1331 |
| - buildOperationUrl: function(operation, modelName, formName, id) { |
1332 |
| - return _buildOperationUrl(config.prefix, operation, modelName, formName, id); |
| 1332 | + buildOperationUrl: function(operation, modelName, formName, id, tab) { |
| 1333 | + return _buildOperationUrl(config.prefix, operation, modelName, formName, id, tab); |
1333 | 1334 | },
|
1334 | 1335 | redirectTo: function () {
|
1335 |
| - return function (operation, scope, location, id) { |
| 1336 | + return function (operation, scope, location, id, tab) { |
1336 | 1337 | // switch (config.routing) {
|
1337 | 1338 | // case 'ngroute' :
|
1338 | 1339 | if (location.search()) {
|
1339 | 1340 | location.url(location.path());
|
1340 | 1341 | }
|
1341 | 1342 |
|
1342 |
| - var urlStr = _buildOperationUrl(config.prefix, operation, scope.modelName, scope.formName, id); |
| 1343 | + var urlStr = _buildOperationUrl(config.prefix, operation, scope.modelName, scope.formName, id, tab); |
1343 | 1344 | location.path(urlStr);
|
1344 | 1345 |
|
1345 | 1346 | // break;
|
|
0 commit comments