Index: core-providers/src/java/membership_mn.properties
===================================================================
--- core-providers/src/java/membership_mn.properties (revision 120571)
+++ core-providers/src/java/membership_mn.properties (working copy)
@@ -14,8 +14,8 @@
\u0410\u043B\u044C \u0447 \u0442\u043E\u0445\u0438\u043E\u043B\u0434\u043E\u043B\u0434, \u0434\u0443\u0440\u044B\u043D \u043D\u044D\u043C\u044D\u043B\u0442 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0443\u0443\u0434 \u043D\u044C "memberRole" \u0441\u0442\u0440\u0438\u043D\u0433 \u0431\u043E\u043B\u043E\u043D "active" Boolean \u0443\u0442\u0433\u0430 \u0445\u043E\u0451\u0440 \u0431\u0430\u0439\u0445 \u0431\u043E\u043B\u043D\u043E. "userIds" \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438\u0439\u0433 (\u0445\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447\u0434\u0438\u0439\u043D ID-\u0433\u0438\u0439\u043D \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442) \u0442\u043E\u0434\u043E\u0440\u0445\u043E\u0439\u043B\u043E\u0436 \u0434\u044D\u044D\u0440 \u0434\u0443\u0440\u0434\u0441\u0430\u043D \u04AF\u04AF\u0440\u044D\u0433 \u0431\u043E\u043B\u043E\u043D \u0438\u0434\u044D\u0432\u0445\u0442\u044D\u0439 \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E\u0433 \u0430\u0448\u0438\u0433\u043B\u0430\u043D \u0443\u0433 \u0431\u0430\u0439\u0440\u043B\u0430\u043B\u0434 \u0431\u0430\u0433\u0446 \u043D\u044D\u043C\u044D\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439 \u044E\u043C.
membership.view.list = \u04E8\u0433\u04E9\u0433\u0434\u043C\u04E9\u043B \u0431\u0430\u0439\u0434\u043B\u0430\u0430\u0440, \u043E\u0434\u043E\u043E\u0433\u0438\u0439\u043D \u0445\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447\u0438\u0434\u044D\u0434 \u0431\u04AF\u0445 \u0441\u0430\u0439\u0442\u043D\u044B \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u043D \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442\u044B\u0433 \u0434\u0443\u0443\u0434\u0430\u0436 \u04E9\u0433\u043D\u04E9.
-\u0425\u04AF\u0441\u044D\u043B\u0442\u0438\u0439\u043D \u043D\u044D\u043C\u044D\u043B\u0442 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0443\u0443\u0434: "includeSite=false" \u043D\u044C \u0441\u0430\u0439\u0442\u043D\u044B \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0448\u04AF\u04AF\u043D\u044D;
-"includeGroup=true" \u043D\u044C \u0431\u04AF\u043B\u0433\u0438\u0439\u043D \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0434\u0443\u0443\u0434\u0430\u0436 \u04E9\u0433\u043D\u04E9; "_locationReference=LOCATION_REFERENCE" \u043D\u044C \u0431\u04AF\u0445 \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0442\u043E\u0434\u043E\u0440\u0445\u043E\u0439 \u0441\u0430\u0439\u0442 \u044D\u0441\u0432\u044D\u043B \u0431\u04AF\u043B\u044D\u0433\u0442 \u0431\u0443\u0446\u0430\u0430\u043D\u0430;
+\u0425\u04AF\u0441\u044D\u043B\u0442\u0438\u0439\u043D \u043D\u044D\u043C\u044D\u043B\u0442 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0443\u0443\u0434: "includeSites=false" \u043D\u044C \u0441\u0430\u0439\u0442\u043D\u044B \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0448\u04AF\u04AF\u043D\u044D;
+"includeGroups=true" \u043D\u044C \u0431\u04AF\u043B\u0433\u0438\u0439\u043D \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0434\u0443\u0443\u0434\u0430\u0436 \u04E9\u0433\u043D\u04E9; "_locationReference=LOCATION_REFERENCE" \u043D\u044C \u0431\u04AF\u0445 \u0433\u0438\u043D\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0442\u043E\u0434\u043E\u0440\u0445\u043E\u0439 \u0441\u0430\u0439\u0442 \u044D\u0441\u0432\u044D\u043B \u0431\u04AF\u043B\u044D\u0433\u0442 \u0431\u0443\u0446\u0430\u0430\u043D\u0430;
"user=USER_ID" (\u044D\u0441\u0432\u044D\u043B "userId=USER_ID" \u0431\u0443\u044E\u0443 "_userReference=USER_REFERENCE") \u043D\u044C \u04E9\u0433\u04E9\u0433\u0434\u0441\u04E9\u043D \u0445\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447\u0438\u0439\u043D \u0433\u0438\u0448\u04AF\u04AF\u043D\u0447\u043B\u044D\u043B\u0438\u0439\u0433 \u0431\u0443\u0446\u0430\u0430\u0436 \u04E9\u0433\u043D\u04E9;
"role=ROLE_STRING" (\u044D\u0441\u0432\u044D\u043B "roleId=ROLE_STRING") \u043D\u044C \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442\u044B\u0433 \u0442\u043E\u0434\u043E\u0440\u0445\u043E\u0439 \u0433\u0438\u0448\u04AF\u04AF\u043D\u0438\u0439 \u04AF\u04AF\u0440\u044D\u0433\u0442 \u0445\u044F\u0437\u0433\u0430\u0430\u0440\u043B\u0430\u043D\u0430.
@@ -44,4 +44,4 @@
-
\ No newline at end of file
+
Index: core-providers/src/java/membership.properties
===================================================================
--- core-providers/src/java/membership.properties (revision 120571)
+++ core-providers/src/java/membership.properties (working copy)
@@ -3,7 +3,7 @@
membership.view.new = (POST) Add the membership specified by the ID. Alternatively, a POST to the simple "/membership" URL can specify "userId" and "locationReference" request parameters. In either case, optional request parameters are: "memberRole" string (default for joinable site memberships is the default joiner role); "active" Boolean value (default is true). Can do a batch add to the same location using the same role by specifying a "userIds" parameter (an array of user IDs).
membership.view.delete = (DELETE) Delete the membership specified by the ID. Multiple memberships can be deleted from the same location by specifying a "userIds" parameter (an array of user IDs).
membership.view.edit = (POST) Modify the membership specified by the ID. Alternatively, a POST to the "/membership" URL can specify "userId" and "locationReference" request parameters. In either case, optional request parameters are: "memberRole" string; "active" Boolean value. Can do a batch update to the same location using the same role and active setting by specifying a "userIds" parameter (an array of user IDs).
-membership.view.list = By default, retrieves a list of all site memberships for the current user. Optional query parameters: "includeSite=false" filters out site memberships; "includeGroup=true" retrieves group memberships; "_locationReference=LOCATION_REFERENCE" returns all memberships in the specified site or group; "user=USER_ID" (or "userId=USER_ID" or "_userReference=USER_REFERENCE") returns the given user's memberships; "role=ROLE_STRING" (or "roleId=ROLE_STRING") restricts the list to the specified member role.
+membership.view.list = By default, retrieves a list of all site memberships for the current user. Optional query parameters: "includeSites=false" filters out site memberships; "includeGroups=true" retrieves group memberships; "_locationReference=LOCATION_REFERENCE" returns all memberships in the specified site or group; "user=USER_ID" (or "userId=USER_ID" or "_userReference=USER_REFERENCE") returns the given user's memberships; "role=ROLE_STRING" (or "roleId=ROLE_STRING") restricts the list to the specified member role.
membership.action.site = The URL format is "/membership/site/:SITE_ID:".
\
(GET) will return all memberships in the specified site.
\
(POST) will add one or more site memberships via an array of "userSearchValues" request parameters (each of which is a user ID, user EID, or email address), along with a "memberRole" string (default for joinable site memberships is the default joiner role) and "active" Boolean value (default is true). Response headers may include "x-warning-not-found" (for a list of invalid userSearchValues) and "x-warning-already-members" (for a list of userSearchValues which were already site members).
@@ -13,4 +13,4 @@
'action' can have values: update, add or remove. If update, replace the current membership with the provided list. If add, add the list to the existing membership, \
if remove, remove the list from the existing membership.
membership.action.join = Allows a user without permissions in a site to join it, works with the current user only: /membership/join/site/siteId
-membership.action.unjoin = Allows a user without permissions in a site to unjoin from it, works with the current user only: /membership/unjoin/site/siteId
\ No newline at end of file
+membership.action.unjoin = Allows a user without permissions in a site to unjoin from it, works with the current user only: /membership/unjoin/site/siteId
Index: core-providers/src/java/membership_ca.properties
===================================================================
--- core-providers/src/java/membership_ca.properties (revision 120571)
+++ core-providers/src/java/membership_ca.properties (working copy)
@@ -24,5 +24,5 @@
membership.action.unjoin = Permet a un usuari donar-se de baixa d''un espai en el qual no t\u00E9 permisos, funciona nom\u00E9s amb l''usuari actual: /membership/unjoin/site/siteId
membership.view.delete = (DELETE) Esborra el membre especificat per l''ID. Es poden eliminar diversos membres d''un espai especificant un par\u00E0metre "userIds" (que consisteix en un array d''IDs d''usuari).
membership.view.edit = (POST) Modifica la filiaci\u00F3 especificada per l''ID. De manera alternativa, un POST a la URL "/membership" pot especificar els par\u00E0metres "userId" i "locationReference" en la sol.licitud. En tot cas, hi ha els seg\u00FCents par\u00E0metres opcionals: la cadena "memberRole"; el valor boole\u00C3\u00A0 "active". Es pot fer una actualitzaci\u00F3 massiva a la mateixa ubicaci\u00F3 usant el mateix rol i la mateixa configuraci\u00F3 activa especificant un par\u00E0metre "userIds" (que consisteix en un array d''IDs d''usuari).
-membership.view.list = Per defecte, retorna una llista amb tots els espais als quals pertany l''usuari. Hi ha els seg\u00FCents par\u00E0metres opcionals de consulta: "includeSite=false" filtra pertinences a espais; "includeGroup=true" retorna pertinences a grups; "_locationReference=LOCATION_REFERENCE" retorna totes les pertinences del grup o espai especificat; "user=USER_ID" (o "userId=USER_ID" o "_userReference=USER_REFERENCE") retorna les pertinences de l''usuari; "role=ROLE_STRING" (o "roleId=ROLE_STRING") restringeix la llista als rols especificats.
+membership.view.list = Per defecte, retorna una llista amb tots els espais als quals pertany l''usuari. Hi ha els seg\u00FCents par\u00E0metres opcionals de consulta: "includeSites=false" filtra pertinences a espais; "includeGroups=true" retorna pertinences a grups; "_locationReference=LOCATION_REFERENCE" retorna totes les pertinences del grup o espai especificat; "user=USER_ID" (o "userId=USER_ID" o "_userReference=USER_REFERENCE") retorna les pertinences de l''usuari; "role=ROLE_STRING" (o "roleId=ROLE_STRING") restringeix la llista als rols especificats.
membership.view.new = (POST) Afegeix la pertinen\u00E7a especificada per l''ID. De manera alternativa, un POST a la URL "/membership" pot incloure els par\u00E0metres "userId" and "locationReference" a la sol\u00B7licitud. En tot cas, hi ha els par\u00E0metres opcionals seg\u00FCents: la cadena "memberRole" (per defecte, en el cas d''espais que permeten afegir membres, el rol per defecte \u00E9s "joiner"); el valor boole\u00E0 "active" (per defecte, "true"). Es pot fer una importaci\u00F3 massiva a un espai usant el mateix rol especificant un par\u00E0metre "userIds" (que consisteix en un array d''IDs d''usuari).