194 instance_operation.note, more htmlEditFormat

v1/resources/bookmark_ls.cfc

@@ -146,8 +146,8 @@
 					 <cfqueryparam cfsqltype="cf_sql_other" value="#local.bookmarkUid#"/>
 					,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.contragentId#"/>
 					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.bookmark)#"/>
-					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.url#"/>
-					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.iconUrl#"/>
+					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.url)#"/>
+					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.iconUrl)#"/>
 					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.descr)#"/>					
 					,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.sort#"/>
 					,<cfqueryparam cfsqltype="cf_sql_bit" value="#arguments.isEnabled#" null=#!isValid("boolean",arguments.isEnabled)#/>

v1/resources/instance.cfc

@@ -152,6 +152,7 @@
 				<m:field formatter=#request.castToBool#>o.is_successful</m:field>
 				<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
 				<m:field>o.error_log</m:field>
+				<m:field>o.note</m:field>
 				<m:field>u.login as updater_login</m:field>
 				<m:field>u.shortname as updater_shortname</m:field>
 				<m:field formatter=#request.castToBool#>coalesce((o.dt_start IS NOT NULL AND o.dt_finish IS NULL AND o.submit_result='201'),false) as is_in_progress</m:field>
@@ -410,13 +411,13 @@
 				 dt_updated=<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 				,updater_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
 				<cfif structKeyExists(arguments,"displayName")>
-					,display_name=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#" />
+					,display_name=<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.displayName)#" />
 				</cfif>
 <!--- 				<cfif structKeyExists(arguments,"displayName")>
 					,resource_realm_id=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.resourceRealmId#" />
 				</cfif> --->
 				<cfif structKeyExists(arguments,"descr")>
-					,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" />		
+					,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.descr)#" />		
 				</cfif>
 				where instance_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceUid#" />;
 				--select @@rowcount as cnt;

v1/resources/instance_ls.cfc

@@ -382,10 +382,10 @@
 				values
 				(
 				 <cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceUid#" />
-				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#"/>	
+				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.displayName)#"/>	
 				,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.serviceId#" />
 				,<cfqueryparam cfsqltype="cf_sql_integer" value="#local.qSpecItem.specification_item_id#" />
-				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" />
+				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.descr)#" />
 				,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 				,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
 				,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />

v1/resources/instance_operation.cfc

@@ -30,6 +30,7 @@
 				<m:field>to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
 				<m:field>o.submit_result</m:field>
 				<m:field>o.error_log</m:field>
+				<m:field>o.note</m:field>
 				<m:field>to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
 				<m:field>to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
 				<m:field title="Длит. сек">extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>

v1/resources/instance_operation_cfs_param.cfc

@@ -202,8 +202,8 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In
 		update instance_operation_cfs_param set
 		 dt_created=<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 		,creator_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
-		,param_value=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.paramValue#" />	
-		,note=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.note#" />	
+		,param_value=<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.paramValue)#" />	
+		,note=<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.note)#" />	
 		where instance_operation_cfs_param_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationCfsParamUid#" null=#!isValid('guid',arguments.instanceOperationCfsParamUid)#/>
 		</cfquery>
 		<!--- *** проверить существование - 404 ---> 

v1/resources/instance_operation_cfs_param_ls.cfc

@@ -232,8 +232,8 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In
 					<cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceOperationCfsParamUid#"/>
 					,<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#"/>
 					,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.svcOperationCfsParamId#"/>
-					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.paramValue#"/>
-					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.note#"/>
+					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.paramValue)#"/>
+					,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.note)#"/>
 					,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 					,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
 				);

v1/resources/instance_operation_cfs_subparam_ls.cfc

@@ -59,9 +59,9 @@
 			values
 			(
 			 <cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationCfsParamUid#" />
-			,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.subparam#" />
+			,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.subparam)#" />
 			,<cfqueryparam cfsqltype="cf_sql_bit" value="#arguments.isSensitive#" />
-			,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.note#" />
+			,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.note)#" />
 			,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 			,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
 			,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />

v1/resources/instance_operation_ls.cfc

@@ -27,7 +27,8 @@
 		"display_name"={prefix="e", type="string"},
 		"service_id"={prefix="e", type="integer"},
 		"svc"={prefix="v", type="string"},
-		"operation"={prefix="o", type="string"},
+		"error_log"={prefix="o", type="string"},
+		"note"={prefix="o", type="string"},
 		"duration"={expression="extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start)", type="numeric"}	
 	}/>
 
@@ -70,7 +71,7 @@
 					<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
 					<m:field title="dt_updated">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field>
 					<m:field title="Отправка">to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
-					<m:field>o.submit_result</m:field>
+					<m:field>o.submit_result</m:field>					
 					<m:field title="Начало">to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
 					<m:field title="Завершение">to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
 					<m:field title="Длит. сек">extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>
@@ -78,6 +79,8 @@
 					<m:field title="Экземпляр">e.display_name</m:field>
 					<m:field title="service_id">e.service_id</m:field>
 					<m:field title="Услуга">v.svc</m:field>		
+					<m:field>o.error_log</m:field>
+					<m:field>o.note</m:field>
 					<m:field>i.specification_item_id</m:field>	
 					<m:field>s.specification_id</m:field>
 					<m:field>d.contract_id</m:field>		
@@ -167,6 +170,7 @@
 	<cffunction name="post" hint="Создание новой операции. Отдельно загружаются CFS параметры, генерируются RFS параметры. Запускается операция отдельным вызовом. До запуска CFS параметры могут корректироваться (а надо?). Запущенная операция вместе с параметрами навсегда становится Read Only (при желании можем реализовать ее клонирование). Можем реализовать корректировку параметров, но непонятно, зачем. Когда мы конфигурируем инстанс, на самом деле мы задаем CFS параметры операции create. Можно править параметры, а можно пересоздать операцию с новыми параметрами. Предусмотреть удаление (метод DELETE) незапущенной операции?">
 		<cfargument name="instanceUid" type="string" required=true hint="type:guid"/>
 		<cfargument name="operation" type="string" required=true hint="type:string decsiption: operation name, e.g. create"/>
+		<cfargument name="note" type="string" required=false default="" hint="type:string decsiption: user notes"/>
 		<!--- <cfargument name="resourceRealmId" type="string" default=-1 hint="type:integer decsiption: идентификатор ресурсной платформы"/> ---><!--- *** --->
 		<!--- *** полноценная валидация операции предполагает проверку, что операция поддерживается для данного сервиса и текущего состояния инстанса. Можно представить себе зависимость этого от параметров, но хотелось бы избежать такого усложнения --->
 		<!--- Можно отметить, что, например, допустимость операции delete зависит от контекста - сколько времени сервис остановлен --->
@@ -214,12 +218,13 @@
 		<cftry>		
 			<cfquery name="local.qSave">
 				insert into instance_operation
-				(instance_uid, instance_operation_uid, operation, dt_created, creator_id, dt_updated, updater_id) 
+				(instance_uid, instance_operation_uid, operation, note, dt_created, creator_id, dt_updated, updater_id) 
 				values 
 				(
 				 <cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceUid#" />
 				,<cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceOperationUid#" />
 				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.operation#"/>	
+				,<cfqueryparam cfsqltype="cf_sql_varchar" value="#htmlEditFormat(arguments.note)#"/>	
 				,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
 				,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
 				,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />