Merge pull request #24 from OpenOlitor/fix/OO-773_use_oo_service

Fix/oo 773 use oo service
OpenOlitor · Oct 9, 2017 · b54ac29 · b54ac29
2 parents 46f5eb5 + 16b1dab
commit b54ac29
Show file tree

Hide file tree

Showing 7 changed files with 11,652 additions and 11 deletions.
diff --git a/app/scripts/common/components/oo-dialogokabort.directive.js b/app/scripts/common/components/oo-dialogokabort.directive.js
@@ -1,8 +1,11 @@
 'use strict';
 
-angular.module('openolitor-core').controller('ooDialogOkAbortModalInstanceCtrl', function ($scope, $uibModalInstance, message) {
+angular.module('openolitor-core').controller('ooDialogOkAbortModalInstanceCtrl', function ($scope, $uibModalInstance, message, title, dismissOnly, dismissButtonTitle) {
 
+  $scope.title = title;
   $scope.message = message;
+  $scope.dismissOnly = dismissOnly;
+  $scope.dismissButtonTitle = dismissButtonTitle;
 
   $scope.ok = function () {
     $uibModalInstance.close();

diff --git a/app/scripts/common/components/oo-dialogokabort.directive.modal.html b/app/scripts/common/components/oo-dialogokabort.directive.modal.html
@@ -1,6 +1,7 @@
 <div class="modal-header">
-  <h3 translate>Bestätigung</h3>
-</div>'
+  <h3 ng-if="title" translate>{{title | translate}}</h3>
+  <h3 ng-if="!title" translate>Bestätigung</h3>
+</div>
 <div class="modal-body">
  <div>
    <span ng-if="message">{{message}}</span>
@@ -9,6 +10,7 @@ <h3 translate>Bestätigung</h3>
 
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn btn-danger" ng-show="true" ng-click="ok()" translate>Ok</button>
-    <button type="button" class="btn btn-primary" ng-click="cancel()" translate>Abbrechen</button>
+    <button ng-if="!dismissOnly" type="button" class="btn btn-danger" ng-show="true" ng-click="ok()" translate>Ok</button>
+    <button ng-if="dismissButtonTitle" type="button" class="btn btn-primary" ng-click="cancel()">{{dismissButtonTitle | translate}}</button>
+    <button ng-if="!dismissButtonTitle" type="button" class="btn btn-primary" ng-click="cancel()" translate>Abbrechen</button>
 </div>
diff --git a/app/scripts/common/services/oo-dialog.service.js b/app/scripts/common/services/oo-dialog.service.js
@@ -3,14 +3,26 @@
   angular.module('openolitor-core').factory('dialogService', ['$uibModal', function($uibModal) {
 
     return {
-      displayDialogOkAbort: function(msg, okFct) {
+      displayDialogOkAbort: function(msg, okFct, title, dismissOnly, dismissButtonTitle) {
         var modalInstance = $uibModal.open({
           animation: true,
           templateUrl: 'scripts/common/components/oo-dialogokabort.directive.modal.html',
           controller: 'ooDialogOkAbortModalInstanceCtrl',
           resolve: {
             message: function() {
               return msg;
+            },
+
+            title: function() {
+              return title;
+            },
+
+            dismissOnly: function() {
+              return dismissOnly;
+            },
+
+            dismissButtonTitle: function() {
+              return dismissButtonTitle;
             }
           }
         });

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "openolitor-core",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "ignore": [],
   "private": false,
   "main": [

diff --git a/dist/scripts/openolitor-core.js b/dist/scripts/openolitor-core.js