smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

222 subparam.func, display_name_pseudorandom

Browse Source
This commit is contained in:
smishchuk
2026-03-30 16:40:55 +03:00
parent 02606b87b6
commit 789f45b3ad
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/Application.cfc
+1 -1
View File
@@ -57,7 +57,7 @@
//variables.framework.docs={}; //variables.framework.docs={};
variables.framework.docs.APIName="svc-api"; variables.framework.docs.APIName="svc-api";
variables.framework.docs.APIVersion="0.221"; /*$ git config --global --unset user.password*/ variables.framework.docs.APIVersion="0.222"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
v1/resources/instance_operation_default.cfc
+13 -7
View File
@@ -181,6 +181,7 @@
,sp.ref_svc_id ,sp.ref_svc_id
,sp.unique_scope ,sp.unique_scope
,sp.default_compute ,sp.default_compute
,sp.func
from svc_operation_cfs_subparam sp from svc_operation_cfs_subparam sp
where sp.svc_operation_cfs_param_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#svc_operation_cfs_param_id#"/> where sp.svc_operation_cfs_param_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#svc_operation_cfs_param_id#"/>
order by sp.sort order by sp.sort
@@ -208,12 +209,13 @@
"isSensitive":#request.castToBool(local.qSubparam.is_sensitive)#, "isSensitive":#request.castToBool(local.qSubparam.is_sensitive)#,
"refSvcId":#local.qSubparam.ref_svc_id#, "refSvcId":#local.qSubparam.ref_svc_id#,
"uniqueScope":"#local.qSubparam.unique_scope#", "uniqueScope":"#local.qSubparam.unique_scope#",
"defaultCompute":"#local.qSubparam.default_compute#", "defaultCompute":"#local.qSubparam.func#",
"func":"#local.qSubparam.default_compute#",
"isModifiableDefinition":false "isModifiableDefinition":false
}, true }, true
) )
/> />
</cfloop> </cfloop> <!--- *** вообще-то передавать в дескриптор func и default_compute не нужно, это для не забыть --->
<cfset local.qCfsParam.data_descriptor = mapDescriptor/> <cfset local.qCfsParam.data_descriptor = mapDescriptor/>
</cfif><!---/map ---> </cfif><!---/map --->
@@ -264,13 +266,17 @@
<cfswitch expression=#arguments.defaultCompute#> <cfswitch expression=#arguments.defaultCompute#>
<cfcase value="display_name"> <cfcase value="display_name">
<cfreturn CreateObject("component", "instance_ls").generateDefaultName(arguments.service_id,arguments.usr_id)/> <cfset var dnGenerator = CreateObject("component", "instance_ls")/>
<cfreturn dnGenerator.generateDefaultName(arguments.service_id,arguments.usr_id)/>
</cfcase> </cfcase>
<cfcase value="append_pseudorandom"> <cfcase value="append_pseudorandom">
<!--- <cfset var generator=createObject('component', 'lib.TokenGenerator')/> <cfset var tGenerator = new lib.TokenGenerator()/>
<cfset generator.init()/> ---> <cfreturn "#arguments.original##lcase(tGenerator.nextToken(6))#"/><!--- почему-то длина отличается, чтобы получить 8 знаков, пишу 6 --->
<cfset var generator = new lib.TokenGenerator()/> </cfcase>
<cfreturn "#arguments.original##lcase(generator.nextToken(6))#"/> <!--- почему-то длина отличается, чтобы получить 8, пишу 6 ---> <cfcase value="display_name_pseudorandom">
<cfset var tGenerator = new lib.TokenGenerator()/>
<cfset var dnGenerator = CreateObject("component", "instance_ls")/>
<cfreturn "#dnGenerator.generateDefaultName(arguments.service_id,arguments.usr_id)##lcase(tGenerator.nextToken(6))#"/>
</cfcase> </cfcase>
<cfdefaultcase> <cfdefaultcase>
<cfreturn #arguments.original#/> <cfreturn #arguments.original#/>