mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-07 14:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
wenbo.dong 2017-08-25 18:07:29 +08:00
parent 76bb72df32
commit c16043cbcb
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server_dist/controllers/project.js
View File

@ -148,7 +148,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'add', key: 'add',
value: function () { value: function () {
var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) { var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
var params, checkRepeat, data, result, colInst, catInst, username; var params, checkRepeat, data, result, colInst, catInst, username;
return _regenerator2.default.wrap(function _callee$(_context) { return _regenerator2.default.wrap(function _callee$(_context) {
while (1) { while (1) {
@ -321,7 +321,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'addMember', key: 'addMember',
value: function () { value: function () {
var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) { var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) {
var params, check, userdata, result, username; var params, check, userdata, result, username;
return _regenerator2.default.wrap(function _callee2$(_context2) { return _regenerator2.default.wrap(function _callee2$(_context2) {
while (1) { while (1) {
@ -444,7 +444,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'delMember', key: 'delMember',
value: function () { value: function () {
var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) { var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
var _this2 = this; var _this2 = this;
var params, check, result, username; var params, check, result, username;
@ -542,7 +542,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'getUserdata', key: 'getUserdata',
value: function () { value: function () {
var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(uid, role) { var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(uid, role) {
var userInst, userData; var userInst, userData;
return _regenerator2.default.wrap(function _callee4$(_context4) { return _regenerator2.default.wrap(function _callee4$(_context4) {
while (1) { while (1) {
@ -600,7 +600,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'getMemberList', key: 'getMemberList',
value: function () { value: function () {
var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) { var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) {
var params, project; var params, project;
return _regenerator2.default.wrap(function _callee5$(_context5) { return _regenerator2.default.wrap(function _callee5$(_context5) {
while (1) { while (1) {
@ -662,7 +662,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'get', key: 'get',
value: function () { value: function () {
var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) { var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) {
var params, result, catInst, cat; var params, result, catInst, cat;
return _regenerator2.default.wrap(function _callee6$(_context6) { return _regenerator2.default.wrap(function _callee6$(_context6) {
while (1) { while (1) {
@ -747,7 +747,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'list', key: 'list',
value: function () { value: function () {
var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) { var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) {
var group_id, auth, result, follow, uids, _users, users; var group_id, auth, result, follow, uids, _users, users;
return _regenerator2.default.wrap(function _callee7$(_context7) { return _regenerator2.default.wrap(function _callee7$(_context7) {
@ -847,7 +847,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'del', key: 'del',
value: function () { value: function () {
var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) { var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) {
var id, interfaceInst, interfaceColInst, interfaceCaseInst, result; var id, interfaceInst, interfaceColInst, interfaceCaseInst, result;
return _regenerator2.default.wrap(function _callee8$(_context8) { return _regenerator2.default.wrap(function _callee8$(_context8) {
while (1) { while (1) {
@ -940,7 +940,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'changeMemberRole', key: 'changeMemberRole',
value: function () { value: function () {
var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) { var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx) {
var _this3 = this; var _this3 = this;
var params, projectInst, check, result, username; var params, projectInst, check, result, username;
@ -1056,7 +1056,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'upSet', key: 'upSet',
value: function () { value: function () {
var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) { var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) {
var _this4 = this; var _this4 = this;
var id, data, result; var id, data, result;
@ -1146,7 +1146,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'up', key: 'up',
value: function () { value: function () {
var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) { var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) {
var id, params, projectData, checkRepeat, data, result, username; var id, params, projectData, checkRepeat, data, result, username;
return _regenerator2.default.wrap(function _callee11$(_context11) { return _regenerator2.default.wrap(function _callee11$(_context11) {
while (1) { while (1) {
@ -1295,7 +1295,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'search', key: 'search',
value: function () { value: function () {
var _ref12 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee12(ctx) { var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(ctx) {
var q, projectList, groupList, projectRules, groupRules, queryList; var q, projectList, groupList, projectRules, groupRules, queryList;
return _regenerator2.default.wrap(function _callee12$(_context12) { return _regenerator2.default.wrap(function _callee12$(_context12) {
while (1) { while (1) {
@ -1370,7 +1370,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'download', key: 'download',
value: function () { value: function () {
var _ref13 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(ctx) { var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(ctx) {
var project_id, interfaceInst, count, arr, fileName, res; var project_id, interfaceInst, count, arr, fileName, res;
return _regenerator2.default.wrap(function _callee13$(_context13) { return _regenerator2.default.wrap(function _callee13$(_context13) {
while (1) { while (1) {