Merge pull request #365 from bjrambo/pr/taeyeon0309-1

업데이트로그를 활용하여 수정하는 기능 추가.

modules/document/document.class.php

@@ -127,6 +127,9 @@ class document extends ModuleObject
 		// 2016. 1. 27: Add a column(declare_message) for report
 		if(!$oDB->isColumnExists("document_declared_log","declare_message")) return true;
 
+		// 2016. 3. 14 Add a column(document_upate_log) for admin
+		if(!$oDB->isColumnExists('document_update_log', 'is_admin')) return true;
+
 		return false;
 	}
 
@@ -328,6 +331,13 @@ class document extends ModuleObject
 			$oDB->addColumn('document_declared_log',"declare_message","text");
 		}
 
+		// 2016. 3. 14 Add a column(document_update_log) for admin
+		if(!$oDB->isColumnExists('document_update_log', 'is_admin'))
+		{
+			$oDB->addColumn('document_update_log', 'is_admin', 'varchar', 1);
+			$oDB->addIndex('document_update_log', 'idx_is_admin', array('is_admin'));
+		}
+
 		return new Object(0,'success_updated');
 	}
 

modules/document/document.controller.php

@@ -476,6 +476,7 @@ class documentController extends document
 			{
 				$obj->extra_vars = serialize($extra_vars);
 				$update_output = $this->insertDocumentUpdateLog($obj);
+
 				if(!$update_output->toBool())
 				{
 					$oDB->rollback();
@@ -749,6 +750,10 @@ class documentController extends document
 			if($obj->update_log_setting === 'Y')
 			{
 				$obj->extra_vars = serialize($extra_vars);
+				if($this->grant->manager)
+				{
+					$obj->is_admin = 'Y';
+				}
 				$update_output = $this->insertDocumentUpdateLog($obj, $source_obj);
 				if(!$update_output->toBool())
 				{
@@ -816,6 +821,7 @@ class documentController extends document
 		$update_args->tags = $obj->tags;
 		$update_args->extra_vars = $obj->extra_vars;
 		$update_args->reason_update = $obj->reason_update;
+		$update_args->is_admin = $obj->is_admin;
 		$update_output = executeQuery('document.insertDocumentUpdateLog', $update_args);
 
 		return $update_output;

modules/document/document.model.php

@@ -1567,6 +1567,25 @@ class documentModel extends document
 
 		return $updage_log;
 	}
+
+	function getUpdateLogAdminisExists($document_srl = null)
+	{
+		if($document_srl == null)
+		{
+			return;
+		}
+		$args = new stdClass();
+		$args->document_srl = $document_srl;
+		$args->is_admin = 'Y';
+		$output = executeQuery('document.getUpdateLogAdminisExists', $args);
+
+		if($output->data->count > 0)
+		{
+			return true;
+		}
+
+		return false;
+	}
 }
 /* End of file document.model.php */
 /* Location: ./modules/document/document.model.php */

modules/document/queries/getDocumentUpdateLog.xml

@@ -9,6 +9,7 @@
 		<column name="title" />
 		<column name="module_srl" />
 		<column name="update_id" />
+		<column name="update_member_srl" />
 	</columns>
 	<conditions>
 		<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />

modules/document/queries/getUpdateLogAdminisExists.xml

@@ -0,0 +1,12 @@
+<query id="getUpdateLog" action="select">
+	<tables>
+		<table name="document_update_log" />
+	</tables>
+	<columns>
+		<column name="count(*)" alias="count" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+		<condition operation="equal" column="is_admin" var="is_admin" pipe="and" />
+	</conditions>
+</query>

modules/document/queries/insertDocumentUpdateLog.xml

@@ -18,5 +18,6 @@
 		<column name="extra_vars" var="extra_vars" />
 		<column name="reason_update" var="reason_update" />
 		<column name="regdate" var="regdate" default="curdate()" />
+		<column name="is_admin" var="is_admin" />
 	</columns>
 </query>

modules/document/schemas/document_update_log.xml

@@ -15,4 +15,5 @@
     <column name="tags" type="text" />
     <column name="extra_vars" type="text" />
     <column name="reason_update" type="text" />
+    <column name="is_admin" type="varchar" size="1" index="idx_is_admin" />
 </table>