From 4e8908de38e0c64a20547dd892dca1d1f9f1bc63 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:16:40 +0900
Subject: [PATCH] 이슈 유형 수정,추가시 업체/ISP/호스팅 개수 명-> 숫자로 수정
---
src/main/webapp/scripts/app/common/common.controller.js | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index d34e718..e35287d 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -6,8 +6,8 @@
function (app, angular) {
app.controller('commonController', ['$scope', '$rootScope', '$log', 'Auth', '$state', 'User', '$resourceProvider', '$uibModal', 'SweetAlert', 'Workspace', '$translate', '$q',
- '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
- function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
+ '$controller', '$injector', '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
+ function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $controller, $injector, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
$scope.fn = {
logout: logout, // 濡쒓렇�븘�썐
@@ -24,7 +24,8 @@
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
changeIssueListMenu : changeIssueListMenu,
setLastIssueType : setLastIssueType,
- searchAll : searchAll // �긽�떒 寃��깋
+ searchAll : searchAll, // �긽�떒 寃��깋
+ sendCommonMail : sendCommonMail
};
$scope.vm = {
@@ -35,6 +36,8 @@
keyWord : ""
}
};
+
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
@@ -65,6 +68,21 @@
$scope.vm.searchAll.keyWord = "";
}
});
+
+ // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+ function sendCommonMail() {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueCommonSendMail.html',
+ size : "md",
+ controller : 'issueCommonSendMailController',
+ backdrop : 'static',
+ resolve : {
+ parameter : {
+ issueId : null,
+ }
+ }
+ });
+ }
// 硫붿씤 �긽�떒 寃��깋
function searchAll() {
@@ -108,7 +126,7 @@
if (changeProject) {
$rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+ //$rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
if ($rootScope.issueTypeMenu != null) {
moveMenu("issues.list");
--
Gitblit v1.8.0