개정판 27cf69cd
- parameter의 NewCommentPermission가 true인 경우에만 하단 markup list에 추가 되도록 수정
Change-Id: I4e48ecc7a00ed21c51c29d800f4fa6eba9b7e0dd
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 408 | 408 |
if (currentUser == null) |
| 409 | 409 |
{
|
| 410 | 410 |
/// create a new markupinfo to do comments |
| 411 |
//var infoId = Commons.shortGuid(); |
|
| 412 |
//PreviewUserMarkupInfoItem = new MarkupInfoItem |
|
| 413 |
//{
|
|
| 414 |
// CreateTime = DateTime.Now, |
|
| 415 |
// UpdateTime = DateTime.Now, |
|
| 416 |
// Depatment = userData.DEPARTMENT, |
|
| 417 |
// DisplayColor = "#FFFF0000", |
|
| 418 |
// UserID = userData.ID, |
|
| 419 |
// UserName = userData.NAME, |
|
| 420 |
// PageCount = 1, |
|
| 421 |
// Description = "", |
|
| 422 |
// MarkupInfoID = infoId, |
|
| 423 |
// MarkupList = null, |
|
| 424 |
// MarkupVersionID = Commons.shortGuid(), |
|
| 425 |
// Consolidate = 0, |
|
| 426 |
// PartConsolidate = 0, |
|
| 427 |
// userDelete = true, |
|
| 428 |
// AvoidConsolidate = 0, |
|
| 429 |
// IsPreviewUser = false |
|
| 430 |
//}; |
|
| 431 |
|
|
| 432 |
//App.Custom_ViewInfoId = infoId; |
|
| 433 |
|
|
| 434 |
//ViewerDataModel.Instance._markupInfoList.Insert(0, PreviewUserMarkupInfoItem); |
|
| 411 |
/// |
|
| 412 |
if (App.ViewInfo.NewCommentPermission) |
|
| 413 |
{
|
|
| 414 |
var infoId = Commons.shortGuid(); |
|
| 415 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
|
| 416 |
{
|
|
| 417 |
CreateTime = DateTime.Now, |
|
| 418 |
UpdateTime = DateTime.Now, |
|
| 419 |
Depatment = userData.DEPARTMENT, |
|
| 420 |
DisplayColor = "#FFFF0000", |
|
| 421 |
UserID = userData.ID, |
|
| 422 |
UserName = userData.NAME, |
|
| 423 |
PageCount = 1, |
|
| 424 |
Description = "", |
|
| 425 |
MarkupInfoID = infoId, |
|
| 426 |
MarkupList = null, |
|
| 427 |
MarkupVersionID = Commons.shortGuid(), |
|
| 428 |
Consolidate = 0, |
|
| 429 |
PartConsolidate = 0, |
|
| 430 |
userDelete = true, |
|
| 431 |
AvoidConsolidate = 0, |
|
| 432 |
IsPreviewUser = false |
|
| 433 |
}; |
|
| 434 |
|
|
| 435 |
App.Custom_ViewInfoId = infoId; |
|
| 436 |
|
|
| 437 |
ViewerDataModel.Instance._markupInfoList.Insert(0, PreviewUserMarkupInfoItem); |
|
| 438 |
} |
|
| 435 | 439 |
} |
| 436 | 440 |
else |
| 437 | 441 |
{
|
| KCOM_API/Web.config | ||
|---|---|---|
| 10 | 10 |
</sectionGroup> |
| 11 | 11 |
</configSections> |
| 12 | 12 |
<connectionStrings> |
| 13 |
<!--효성 Connection String--> |
|
| 13 | 14 |
<add name="ConnectionString" |
| 14 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
| 15 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
| 15 | 16 |
providerName="System.Data.EntityClient"/> |
| 16 | 17 |
<add name="CIConnectionString" |
| 17 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
| 18 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
| 18 | 19 |
providerName="System.Data.EntityClient"/> |
| 19 | 20 |
</connectionStrings> |
| 20 | 21 |
<!-- |
| ... | ... | |
| 81 | 82 |
<applicationSettings> |
| 82 | 83 |
<KCOM_API.Properties.Settings> |
| 83 | 84 |
<setting name="TileSoucePath" serializeAs="String"> |
| 84 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
| 85 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
| 85 | 86 |
</setting> |
| 86 | 87 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
| 87 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
| 88 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
| 88 | 89 |
</setting> |
| 89 | 90 |
<setting name="IsProjectNoPass" serializeAs="String"> |
| 90 | 91 |
<value>True</value> |
내보내기 Unified diff
