You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@activemq.apache.org by stanlyDoge <gi...@git.apache.org> on 2018/03/01 14:30:26 UTC
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
GitHub user stanlyDoge opened a pull request:
https://github.com/apache/activemq-artemis/pull/1913
ARTEMIS-1715 Disable to remove a divert from hawtio console
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/stanlyDoge/activemq-artemis ARTEMIS-1715
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/activemq-artemis/pull/1913.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1913
----
commit 0809b7794e16cd8981209f30f7ec3adf6ce0a114
Author: Stanislav Knot <sk...@...>
Date: 2018-03-01T14:29:22Z
ARTEMIS-1715 Disable to remove a divert from hawtio console
----
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172316762
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -96,6 +96,9 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/deleteAddress', {
templateUrl: ARTEMIS.templatePath + 'deleteAddress.html'
})
+ .when('/artemis/deleteDivert', {
--- End diff --
If the intent is not to delete a divert as per reply to previous comment, then this should not be added
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by stanlyDoge <gi...@git.apache.org>.
Github user stanlyDoge commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172447340
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -96,6 +96,9 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/deleteAddress', {
templateUrl: ARTEMIS.templatePath + 'deleteAddress.html'
})
+ .when('/artemis/deleteDivert', {
--- End diff --
Well, it shows page without such button. But I agree it would be better to hide this button in "toolbar". I will take a look at this.
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172121106
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteDivert.html ---
@@ -0,0 +1,24 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ Architecture
+-->
+<div class="row-fluid">
--- End diff --
If that’s the case please close this pr
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by stanlyDoge <gi...@git.apache.org>.
Github user stanlyDoge commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172446094
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -96,6 +96,9 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/deleteAddress', {
templateUrl: ARTEMIS.templatePath + 'deleteAddress.html'
})
+ .when('/artemis/deleteDivert', {
--- End diff --
Current behaviour is this: user has divert selected and wants to remove it. So he click on Delete. But hawtio console does not recognize divert and tries to remove address at which the divert is created.
---
[GitHub] activemq-artemis issue #1913: ARTEMIS-1715 Disable to remove a divert from h...
Posted by stanlyDoge <gi...@git.apache.org>.
Github user stanlyDoge commented on the issue:
https://github.com/apache/activemq-artemis/pull/1913
@clebertsuconic Done
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/activemq-artemis/pull/1913
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172121469
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteDivert.html ---
@@ -0,0 +1,24 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ Architecture
+-->
+<div class="row-fluid">
--- End diff --
Eg there is code in this pr that signifies otherwise
---
[GitHub] activemq-artemis issue #1913: ARTEMIS-1715 Disable to remove a divert from h...
Posted by clebertsuconic <gi...@git.apache.org>.
Github user clebertsuconic commented on the issue:
https://github.com/apache/activemq-artemis/pull/1913
@michaelandrepearce is this good to merge? (the PR check failure is probably not related).
@stanlyDoge if you could please rebase to have a re-run?
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by stanlyDoge <gi...@git.apache.org>.
Github user stanlyDoge commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172115995
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteDivert.html ---
@@ -0,0 +1,24 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ Architecture
+-->
+<div class="row-fluid">
--- End diff --
Hi Michael. After discussion with @andytaylor we decided that divert should not be deletable from web console, so there is no need to have pop-up.
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172086640
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteDivert.html ---
@@ -0,0 +1,24 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ Architecture
+-->
+<div class="row-fluid">
--- End diff --
Please see other delete's note the extra are you sure kind of pop up. This should be the same, see https://github.com/stanlyDoge/activemq-artemis/blob/0809b7794e16cd8981209f30f7ec3adf6ce0a114/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/deleteAddress.html
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172086296
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -96,6 +96,9 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/deleteAddress', {
templateUrl: ARTEMIS.templatePath + 'deleteAddress.html'
})
+ . when('/artemis/deleteDivert', {
--- End diff --
space between . and when
---
[GitHub] activemq-artemis issue #1913: ARTEMIS-1715 Disable to remove a divert from h...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on the issue:
https://github.com/apache/activemq-artemis/pull/1913
@clebertsuconic yup, looks better, i've merged.
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172446748
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -96,6 +96,9 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/deleteAddress', {
templateUrl: ARTEMIS.templatePath + 'deleteAddress.html'
})
+ .when('/artemis/deleteDivert', {
--- End diff --
Then the consoles should hide the button, if divert is selected.
---
[GitHub] activemq-artemis pull request #1913: ARTEMIS-1715 Disable to remove a divert...
Posted by michaelandrepearce <gi...@git.apache.org>.
Github user michaelandrepearce commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1913#discussion_r172316744
--- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js ---
@@ -231,6 +234,17 @@ var ARTEMIS = (function(ARTEMIS) {
}
});
+ workspace.subLevelTabs.push({
--- End diff --
If the intent is not to delete a divert as per reply to previous comment, then this should not be added
---