From aa437650106bc3399470ba15ce4098d2bb863bd7 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 24 Oct 2018 17:34:38 +0800
Subject: [PATCH] fix

---
 src/main/ui/static/config/organizations/organizations.js    | 2 +-
 .../ui/static/config/organizations/templates/new_org.html   | 6 +++---
 .../static/config/organizations/templates/org_detail.html   | 2 +-
 src/main/ui/static/payment/partner/partner-manage.js        | 4 ++--
 .../ui/static/payment/partner/templates/partner_detail.html | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/ui/static/config/organizations/organizations.js b/src/main/ui/static/config/organizations/organizations.js
index b3a93a524..aa5ae2675 100644
--- a/src/main/ui/static/config/organizations/organizations.js
+++ b/src/main/ui/static/config/organizations/organizations.js
@@ -369,7 +369,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                     content: 'Creation of new organization succeeded',
                     type: 'success'
                 });
-                $state.go('^.detail',{orgId:resp.data.org_id},{reload:true});
+                $state.go('organizations.detail',{orgId:resp.data.org_id},{reload:true});
             },function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             })
diff --git a/src/main/ui/static/config/organizations/templates/new_org.html b/src/main/ui/static/config/organizations/templates/new_org.html
index 13eaf2fed..4c3442ede 100644
--- a/src/main/ui/static/config/organizations/templates/new_org.html
+++ b/src/main/ui/static/config/organizations/templates/new_org.html
@@ -1,9 +1,9 @@
 <section class="content-header">
     <h1>New Organization</h1>
     <ol class="breadcrumb">
-        <li><i class="fa fa-users"></i> Basic Config</li>
+        <li><i class="fa fa-users"></i> Framework</li>
         <li>
-            <a ui-sref="^" ui-sref-opts="{reload:true}">Organizations</a>
+            <a ui-sref="organizations" ui-sref-opts="{reload:true}">Organizations</a>
         </li>
         <li class="active">New Organization</li>
     </ol>
@@ -304,7 +304,7 @@
                 <div class="btn-group margin-bottom margin-top">
                     <button class="btn btn-success" type="button" ng-click="saveOrg(org_form)">Save
                     </button>
-                    <a class="btn btn-danger" role="button" ui-sref="^" ui-sref-opts="{reload:true}">Back</a>
+                    <a class="btn btn-danger" role="button" ui-sref="organizations" ui-sref-opts="{reload:true}">Back</a>
                 </div>
                 <!--<button class="btn btn-success col-sm-offset-2" ng-click="update()"><i class="fa fa-save"></i> Update</button>-->
             </form>
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 9fa311101..8cea0a62b 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -11,7 +11,7 @@
 <section class="content-header">
     <h1 ng-bind="org.name"></h1>
     <ol class="breadcrumb">
-        <li><i class="fa fa-users"></i> Basic Config</li>
+        <li><i class="fa fa-users"></i> Framework</li>
         <li>
             <a ui-sref="^" ui-sref-opts="{reload:true}">Organizations</a>
         </li>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 269e64bca..58b558682 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -521,8 +521,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $http.post('/sys/partners', $scope.partner).then(function (resp) {
                 commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
                 $scope.updateMerchantLocation();
-                $scope.loadPartners();
-                $state.go('^.detail', {clientMoniker: resp.data.client_moniker})
+                // $scope.loadPartners();
+                $state.go('partners.detail', {clientMoniker: resp.data.client_moniker})
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             });
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 91275cb48..a773bec40 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -43,9 +43,9 @@
     </h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Payment
+            <i class="fa fa-sitemap"></i> Partner Manage
         </li>
-        <li><a ui-sref="^">Partner Manage</a></li>
+        <li><a ui-sref="^">Partner Directories</a></li>
         <li class="active">Partner Detail</li>
     </ol>
 </section>