[GitHub] guacamole-client pull request #265: GUACAMOLE-526: Update webapp to angular ...

[mike-jumper]

Github user mike-jumper commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/265#discussion_r174346931
  
--- Diff: guacamole/pom.xml ---
@@ -388,9 +388,14 @@
 
 org.webjars.bower
 angular-translate-loader-static-files
-2.8.0
+2.16.0
 runtime
 
+
+org.webjars.bower
+angular-toArrayFilter
--- End diff --

Same for the bundled dependencies which are already documented but whose 
versions have changed:


https://github.com/apache/guacamole-client/blob/a6579ce4e1c70ea436fa1acc26a9ce2bb1e7fe84/guacamole/src/licenses/LICENSE#L214-L220


---

[GitHub] guacamole-client pull request #265: GUACAMOLE-526: Update webapp to angular ...

[mike-jumper]

Github user mike-jumper commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/265#discussion_r174346819
  
--- Diff: guacamole/pom.xml ---
@@ -388,9 +388,14 @@
 
 org.webjars.bower
 angular-translate-loader-static-files
-2.8.0
+2.16.0
 runtime
 
+
+org.webjars.bower
+angular-toArrayFilter
--- End diff --

The licenses of bundled dependencies will need to be updated 
(`guacamole/src/licenses`).


---

[GitHub] guacamole-client pull request #265: GUACAMOLE-526: Update webapp to angular ...

[jmuehlner]

Github user jmuehlner commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/265#discussion_r174344419
  
--- Diff: guacamole/pom.xml ---
@@ -388,9 +388,14 @@
 
 org.webjars.bower
 angular-translate-loader-static-files
-2.8.0
+2.16.0
 runtime
 
+
+org.webjars.bower
+angular-toArrayFilter
--- End diff --

The `orderBy` filter no longer supports objects, which necessitates 
transforming any object into an array before using it - that's what this new 
dependency is for.


---

[GitHub] guacamole-client pull request #265: GUACAMOLE-526: Update webapp to angular ...

[jmuehlner]

GitHub user jmuehlner opened a pull request:

https://github.com/apache/guacamole-client/pull/265

GUACAMOLE-526: Update webapp to angular 1.6.9.



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/jmuehlner/guacamole-client angular-1.6.9

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/guacamole-client/pull/265.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 #265


commit e5e92e08ec319f80ddf9aef8c17ed42bcd00c193
Author: James Muehlner 
Date:   2018-03-14T02:58:34Z

GUACAMOLE-526: Update webapp to angular 1.6.9.




---

[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...

[necouchman]

Github user necouchman commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/264#discussion_r174318995
  
--- Diff: 
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
 ---
@@ -66,12 +65,11 @@
 );
 
 DELETE FROM [guacamole_user_password_history]
-WHERE password_history_id IN (
-SELECT password_history_id
+WHERE password_history_id NOT IN (
--- End diff --

> I think I see what you're trying to do here now. Maybe needs an AND 
user_id = #{record.userID,jdbcType=INTEGER} at the level of the outer select?

Yep!  Commit coming right up...


---

[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...

[mike-jumper]

Github user mike-jumper commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/264#discussion_r174302432
  
--- Diff: 
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
 ---
@@ -66,12 +65,11 @@
 );
 
 DELETE FROM [guacamole_user_password_history]
-WHERE password_history_id IN (
-SELECT password_history_id
+WHERE password_history_id NOT IN (
--- End diff --

I think I see what you're trying to do here now. Maybe needs an `AND 
user_id = #{record.userID,jdbcType=INTEGER}` at the level of the outer select?


---

[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...

[mike-jumper]

Github user mike-jumper commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/264#discussion_r174300331
  
--- Diff: 
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
 ---
@@ -66,12 +65,11 @@
 );
 
 DELETE FROM [guacamole_user_password_history]
-WHERE password_history_id IN (
-SELECT password_history_id
+WHERE password_history_id NOT IN (
--- End diff --

Won't this now delete password history for all other users?


---

[GitHub] guacamole-client pull request #264: GUACAMOLE-525: Fix issues with SQL Serve...

[necouchman]

GitHub user necouchman opened a pull request:

https://github.com/apache/guacamole-client/pull/264

GUACAMOLE-525: Fix issues with SQL Server compatibility

Fixes a couple of issues reported with SQL Server compatibility and the 
lack of support for the LIMIT keyword.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/necouchman/guacamole-client jira/525

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/guacamole-client/pull/264.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 #264


commit cb580c4ae99fb8ff21618d9117aee9f22bf6e3ff
Author: Nick Couchman 
Date:   2018-03-13T21:47:35Z

GUACAMOLE-525: Remove LIMIT and use TOP in SQL Server module.

commit 62a706896ae7cd788337128a4cbc95db763ada9d
Author: Nick Couchman 
Date:   2018-03-13T21:58:54Z

GUACAMOLE-525: Fix up password history delete to be more compatible.




---

[GitHub] guacamole-client pull request #263: GUACAMOLE-505: Remove stray left join in...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/guacamole-client/pull/263


---

[GitHub] guacamole-client pull request #263: GUACAMOLE-505: Remove stray left join in...

[necouchman]

GitHub user necouchman opened a pull request:

https://github.com/apache/guacamole-client/pull/263

GUACAMOLE-505: Remove stray left join in SQL Server UserMapper.

Fix for issue identified in GUACAMOLE-505 for the stray left join in the 
SQL Server UserMapper.xml file.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/necouchman/guacamole-client jira/505

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/guacamole-client/pull/263.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 #263


commit d3dcd84379eb0c49b2af5341215c5784ac4ed628
Author: Nick Couchman 
Date:   2018-03-13T14:47:31Z

GUACAMOLE-505: Remove stray left join in SQL Server UserMapper.




---

[GitHub] guacamole-client pull request #194: GUACAMOLE-221: Support for Connection Pr...

[necouchman]

Github user necouchman commented on a diff in the pull request:

https://github.com/apache/guacamole-client/pull/194#discussion_r174090051
  
--- Diff: 
guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java ---
@@ -50,6 +50,16 @@
  */
 public static final String CLIENT_ADDRESS_TOKEN = 
"GUAC_CLIENT_ADDRESS";
 
+/**
+ * The token that triggers prompts for numeric fields.
+ */
+public static final String PROMPT_TOKEN_NUMERIC = "-1";
+
+/**
+ * The token that triggers prompts for string fields.
+ */
+public static final String PROMPT_TOKEN_STRING = "GUAC_PROMPT";
--- End diff --

If the whole string needs to be prompted, then you just put 
```${GUAC_PROMPT}``` in for the whole string.  In Guacamole null or empty 
values indicate the absence of a parameter and delete that parameter from the 
underlying database table (in the JDBC modules, anyway), so prompting for an 
empty value would not be practical and would interfere with some of the basic 
ways in which parameters are evaluated, aside from which it isn't really 
necessary.


---