Ver código fonte

Ticket #724 - Usage in Timeline.

AntonLV 8 anos atrás
pai
commit
54636aa774

+ 13 - 6
modules/boonex/timeline/classes/BxTimelineModule.php

@@ -1649,16 +1649,23 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             if($bText)
             	$aContent['text'] = $sText;
 
-            //--- Process Privacy ---//
-            $iObjectPrivacyView = (int)$oForm->getCleanValue('object_privacy_view');
-            if(empty($iObjectPrivacyView))
-                $iObjectPrivacyView = $this->_oConfig->getPrivacyViewDefault('object');
-
             $aValsToAdd = array(
-            	'object_privacy_view' => $iObjectPrivacyView,
             	'content' => serialize($aContent)
             );
 
+            //--- Process Privacy ---//
+            $iObjectPrivacyView = (int)$oForm->getCleanValue('object_privacy_view');
+            $iObjectPrivacyViewDefault = $this->_oConfig->getPrivacyViewDefault('object');
+            if(empty($iObjectPrivacyView))
+                $aValsToAdd = array_merge($aValsToAdd, array(
+                    'object_privacy_view' => $iObjectPrivacyViewDefault
+                ));
+            else if($iObjectPrivacyView < 0) 
+                $aValsToAdd = array_merge($aValsToAdd, array(
+                    'owner_id' => abs($iObjectPrivacyView),
+                    'object_privacy_view' => $iObjectPrivacyViewDefault
+                ));
+
             //--- Process Date ---//
             if(isset($oForm->aInputs['date'])) {
                 $iDate = $oForm->getCleanValue('date');

+ 10 - 2
modules/boonex/timeline/classes/BxTimelineResponse.php

@@ -59,9 +59,17 @@ class BxTimelineResponse extends BxBaseModNotificationsResponse
                 break;
 
             case BX_BASE_MOD_NTFS_HANDLER_TYPE_UPDATE:
-                $sContent = !empty($oAlert->aExtras) && is_array($oAlert->aExtras) ? serialize(bx_process_input($oAlert->aExtras)) : '';
+                $aParamsSet = array(
+                	'content' => !empty($oAlert->aExtras) && is_array($oAlert->aExtras) ? serialize(bx_process_input($oAlert->aExtras)) : ''
+                );
 
-                $this->_oModule->_oDb->updateEvent(array('object_privacy_view' => $iObjectPrivacyView, 'content' => $sContent), array('type' => $oAlert->sUnit, 'object_id' => $oAlert->iObject));
+                if($iObjectPrivacyView < 0)
+                    $aParamsSet = array_merge($aParamsSet, array(
+                        'owner_id' => abs($iObjectPrivacyView),
+                        'object_privacy_view' => $this->_oModule->_oConfig->getPrivacyViewDefault('object'), 
+                    ));
+                
+                $this->_oModule->_oDb->updateEvent($aParamsSet, array('type' => $oAlert->sUnit, 'object_id' => $oAlert->iObject));
                 break;
 
             case BX_BASE_MOD_NTFS_HANDLER_TYPE_DELETE:

+ 5 - 6
modules/boonex/timeline/install/sql/install.sql

@@ -356,12 +356,11 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_timeline_post_edit', 'action', 2147483647, 1, 2),
 ('bx_timeline_post_edit', 'owner_id', 2147483647, 1, 3),
 ('bx_timeline_post_edit', 'text', 2147483647, 1, 4),
-('bx_timeline_post_edit', 'object_privacy_view', 2147483647, 1, 5),
-('bx_timeline_post_edit', 'date', 192, 1, 6),
-('bx_timeline_post_edit', 'location', 2147483647, 1, 7),
-('bx_timeline_post_edit', 'controls', 2147483647, 1, 8),
-('bx_timeline_post_edit', 'do_submit', 2147483647, 1, 9),
-('bx_timeline_post_edit', 'do_cancel', 2147483647, 1, 10);
+('bx_timeline_post_edit', 'date', 192, 1, 5),
+('bx_timeline_post_edit', 'location', 2147483647, 1, 6),
+('bx_timeline_post_edit', 'controls', 2147483647, 1, 7),
+('bx_timeline_post_edit', 'do_submit', 2147483647, 1, 8),
+('bx_timeline_post_edit', 'do_cancel', 2147483647, 1, 9);
 
 -- Forms -> Attach link
 INSERT INTO `sys_objects_form` (`object`, `module`, `title`, `action`, `form_attrs`, `submit_name`, `table`, `key`, `uri`, `uri_title`, `params`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES

+ 4 - 0
modules/boonex/timeline/template/css/view.css

@@ -138,6 +138,10 @@ div.bx-tl-item-content {
 	position: relative;
     text-align: left;
 }
+div.bx-tl-item-content form {
+	padding-left: 1rem;
+	padding-right: 1rem;
+}
 div.bx-tl-item-content div.bx-tl-title {
 	text-overflow: ellipsis;
     overflow: hidden;