Compare commits
4
Commits
shs-patch
...
epcc-patch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4950688a78 | ||
|
|
439c8a5384 | ||
|
|
4a28e44f2e | ||
|
|
81a38a577b |
No files matched your search
+1
-1
@@ -291,7 +291,6 @@
|
|||||||
<delete id="delete">
|
<delete id="delete">
|
||||||
DELETE FROM guacamole_entity
|
DELETE FROM guacamole_entity
|
||||||
WHERE
|
WHERE
|
||||||
type = 'USER_GROUP'
|
|
||||||
<choose>
|
<choose>
|
||||||
<when test="caseSensitivity.caseSensitiveGroupNames()">
|
<when test="caseSensitivity.caseSensitiveGroupNames()">
|
||||||
name = #{identifier,jdbcType=VARCHAR}
|
name = #{identifier,jdbcType=VARCHAR}
|
||||||
@@ -300,6 +299,7 @@
|
|||||||
LOWER(name) = LOWER(#{identifier,jdbcType=VARCHAR})
|
LOWER(name) = LOWER(#{identifier,jdbcType=VARCHAR})
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
|
AND type = 'USER_GROUP'
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<!-- Insert single group -->
|
<!-- Insert single group -->
|
||||||
|
|||||||
+1
-1
@@ -96,7 +96,7 @@
|
|||||||
guacamole_entity.type = 'USER_GROUP'
|
guacamole_entity.type = 'USER_GROUP'
|
||||||
AND
|
AND
|
||||||
<choose>
|
<choose>
|
||||||
<when test="caseSensitivity.caesSensitiveGroupNames()">
|
<when test="caseSensitivity.caseSensitiveGroupNames()">
|
||||||
guacamole_entity.name
|
guacamole_entity.name
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
|
|||||||
@@ -121,6 +121,8 @@ angular.module('storage').provider('localStorageService', [function localStorage
|
|||||||
|
|
||||||
// Pull and parse value from internal storage, if present
|
// Pull and parse value from internal storage, if present
|
||||||
var data = storedItems[key];
|
var data = storedItems[key];
|
||||||
|
if (!data || data === "undefined")
|
||||||
|
return null;
|
||||||
if (data)
|
if (data)
|
||||||
return JSON.parse(data);
|
return JSON.parse(data);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user