Update change log and spec for wrt-plugins-tizen_0.4.70

[framework/web/wrt-plugins-tizen.git] / src / Calendar / CalendarConverter.cpp

diff --git a/src/Calendar/CalendarConverter.cpp b/src/Calendar/CalendarConverter.cpp
index d2e015e..90909eb 100755 (executable)
--- a/src/Calendar/CalendarConverter.cpp
+++ b/src/Calendar/CalendarConverter.cpp
@@ -45,9 +45,18 @@ const int DEFAULT_EVENT_INTERVAL = 1;
 namespace DeviceAPI {
 namespace Calendar {
 
-CalendarConverter::CalendarConverter(JSContextRef context, CalendarEvent::CalendarType calendarType) : Converter(context)
+CalendarConverter::CalendarConverter(JSContextRef context, CalendarEvent::CalendarType calendarType,
+        DeviceAPI::Common::SecurityAccessor *securityAccessor) : Converter(context)
 {
     m_calendarType = calendarType;
+    m_securityAccessor = securityAccessor;
+}
+
+CalendarConverter::CalendarConverter(JSContextRef context, DeviceAPI::Common::SecurityAccessor *securityAccessor,
+        CalendarEvent::CalendarType calendarType) : Converter(context)
+{
+    m_securityAccessor = securityAccessor;
+    m_calendarType = calendarType;
 }
 
 CalendarConverter::~CalendarConverter()
@@ -56,12 +65,18 @@ CalendarConverter::~CalendarConverter()
 
 JSValueRef CalendarConverter::toJSValueRefEvent(const CalendarEventPtr& arg)
 {
-    return JSUtils::makeObject(m_context, JSCalendarEvent::getClassRef(), arg);
+    CalendarEventPrivObject *priv = new CalendarEventPrivObject(m_context, arg);
+    if(m_securityAccessor != NULL)
+        priv->copyAceCheckAccessFunction(m_securityAccessor);
+    return JSObjectMake(m_context, JSCalendarEvent::getClassRef(), priv);
 }
 
 JSValueRef CalendarConverter::toJSValueRefTask(const CalendarEventPtr& arg)
 {
-    return JSUtils::makeObject(m_context, JSCalendarTask::getClassRef(), arg);
+    CalendarTaskPrivObject *priv = new CalendarTaskPrivObject(m_context, arg);
+    if(m_securityAccessor != NULL)
+        priv->copyAceCheckAccessFunction(m_securityAccessor);
+    return JSObjectMake(m_context, JSCalendarTask::getClassRef(), priv);
 }
 
 JSValueRef CalendarConverter::toJSValueRefEventArray(const CalendarEventListPtr &arg)
@@ -77,6 +92,8 @@ JSValueRef CalendarConverter::toJSValueRefTaskArray(const CalendarEventListPtr &
 JSValueRef CalendarConverter::toJSValueRefCalendar(const ICalendarPtr& arg)
 {
     CalendarPrivObject *priv = new CalendarPrivObject(m_context, arg);
+    if(m_securityAccessor != NULL)
+        priv->copyAceCheckAccessFunction(m_securityAccessor);
     return JSObjectMake(m_context, JSCalendar::getClassRef(), priv);
 }