verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
Conversation 0 Commits 233 Files Changed 166 +5 -4
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da7ab00c73 - Show all commits

1
Jenkinsfile vendored
View File

@ -71,6 +71,7 @@ pipeline {
stage('Back') { stage('Back') {
steps { steps {
sh 'pnpm install --prefer-offline' sh 'pnpm install --prefer-offline'
sh 'node node_modules/puppeteer/install.mjs'
} }
} }
stage('Print') { stage('Print') {

2
front/salix/components/change-password/index.js
View File

@ -1,5 +1,5 @@
import ngModule from '../../module'; import ngModule from '../../module';
const UserError = require('vn-loopback/util/user-error'); import UserError from 'core/lib/user-error';
export default class Controller { export default class Controller {
constructor($scope, $element, $http, vnApp, $translate, $state, $location) { constructor($scope, $element, $http, vnApp, $translate, $state, $location) {

2
front/salix/components/reset-password/index.js
View File

@ -1,5 +1,5 @@
import ngModule from '../../module'; import ngModule from '../../module';
const UserError = require('vn-loopback/util/user-error'); import UserError from 'core/lib/user-error';
export default class Controller { export default class Controller {
constructor($scope, $element, $http, vnApp, $translate, $state, $location) { constructor($scope, $element, $http, vnApp, $translate, $state, $location) {

2
modules/ticket/front/main/index.js
View File

@ -1,6 +1,6 @@
import ngModule from '../module'; import ngModule from '../module';
import ModuleMain from 'salix/components/module-main'; import ModuleMain from 'salix/components/module-main';
const UserError = require('vn-loopback/util/user-error'); import UserError from 'core/lib/user-error';
export default class Ticket extends ModuleMain { export default class Ticket extends ModuleMain {
fetchParams($params) { fetchParams($params) {

2
modules/worker/front/descriptor/index.js
View File

@ -1,6 +1,6 @@
import ngModule from '../module'; import ngModule from '../module';
import Descriptor from 'salix/components/descriptor'; import Descriptor from 'salix/components/descriptor';
const UserError = require('vn-loopback/util/user-error'); import UserError from 'core/lib/user-error';
class Controller extends Descriptor { class Controller extends Descriptor {
constructor($element, $, $rootScope) { constructor($element, $, $rootScope) {
super($element, $); super($element, $);