Merge pull request #331 from humhub/enh/239-stream-create-form-menu

Menu for create calendar from wall stream
humhub · Nov 7, 2022 · 0439557 · 0439557
2 parents 7540698 + 94e7f76
commit 0439557
Show file tree

Hide file tree

Showing 15 changed files with 569 additions and 166 deletions.
diff --git a/Events.php b/Events.php
@@ -408,4 +408,5 @@ public static function onRestApiAddRules()
 
         ], 'calendar');
     }
+
 }
diff --git a/Module.php b/Module.php
@@ -181,4 +181,12 @@ public function getContainerPermissions($contentContainer = null)
         }
         return [];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContentClasses(): array
+    {
+        return [CalendarEntry::class];
+    }
 }
diff --git a/controllers/EntryController.php b/controllers/EntryController.php
@@ -2,17 +2,18 @@
 
 namespace humhub\modules\calendar\controllers;
 
+use DateTime;
+use humhub\modules\calendar\helpers\CalendarUtils;
 use humhub\modules\calendar\models\CalendarEntryParticipant;
 use humhub\modules\calendar\models\forms\CalendarEntryParticipationForm;
 use humhub\modules\calendar\notifications\Invited;
-use humhub\modules\calendar\widgets\ParticipantAddForm;
 use humhub\modules\calendar\widgets\ParticipantItem;
 use humhub\modules\calendar\helpers\Url;
 use humhub\modules\calendar\models\forms\CalendarEntryForm;
 use humhub\modules\stream\actions\Stream;
+use humhub\modules\stream\actions\StreamEntryResponse;
 use humhub\modules\user\models\User;
 use humhub\modules\content\components\ContentContainerController;
-use humhub\modules\calendar\permissions\CreateEntry;
 use humhub\modules\calendar\models\CalendarEntry;
 use humhub\widgets\ModalClose;
 use Throwable;
@@ -175,27 +176,43 @@ public function actionRespond($id, $type)
         return $this->asJson(['success' => true]);
     }
 
+    /**
+     * Add a calendar Entry from wall stream
+     *
+     * @return string
+     * @throws Exception
+     * @throws HttpException
+     * @throws InvalidConfigException
+     * @throws Throwable
+     */
+    public function actionAddFromWall()
+    {
+        $date = (new DateTime('now'))->setTime(date('H'), 0)->format(CalendarUtils::DATE_FORMAT_ATOM);
+        return $this->actionEdit(null, $date, $date, 1, 'month', true);
+    }
+
     /**
      *
      * @param null $id calendar entry id
      * @param null $start FullCalendar start datetime e.g.: 2020-01-01 00:00:00
      * @param null $end FullCalendar end datetime e.g.: 2020-01-02 00:00:00
      * @param null $cal whether or not the edit event came from the calendar view
      * @param string|null $view FullCalendar view mode, 'month'
-     * @return string
+     * @param bool $wall True when a Calendary Entry is created/updated from wall stream
+     * @return string|Response
      * @throws HttpException
      * @throws Throwable
      * @throws Exception
      * @throws InvalidConfigException
      */
-    public function actionEdit($id = null, $start = null, $end = null, $cal = null, $view = null)
+    public function actionEdit($id = null, $start = null, $end = null, $cal = null, $view = null, $wall = null)
     {
         if (empty($id) && !$this->canCreateEntries()) {
             throw new HttpException(403);
         }
 
         if (empty($id) && $this->canCreateEntries()) {
-            $calendarEntryForm = CalendarEntryForm::createEntry($this->contentContainer, $start, $end, $view);
+            $calendarEntryForm = CalendarEntryForm::createEntry($this->contentContainer, $start, $end, $view, $wall);
         } else {
             $calendarEntryForm = new CalendarEntryForm(['entry' => $this->getCalendarEntry($id)]);
             if(!$calendarEntryForm->entry->content->canEdit()) {
@@ -208,7 +225,16 @@ public function actionEdit($id = null, $start = null, $end = null, $cal = null,
         }
 
         if ($calendarEntryForm->load(Yii::$app->request->post()) && $calendarEntryForm->save()) {
-            if(empty($cal)) {
+            if ($wall) {
+                $entry = StreamEntryResponse::getAsArray($calendarEntryForm->entry->content);
+                $entry['reloadWall'] = true;
+                $entry['content'] = $entry['output'];
+                $entry['output'] = $this->renderModalParticipation($calendarEntryForm->entry, null, true);
+
+                return $this->asJson($entry);
+            }
+
+            if (empty($cal)) {
                 return ModalClose::widget(['saved' => true]);
             }
 
@@ -224,7 +250,7 @@ public function actionEdit($id = null, $start = null, $end = null, $cal = null,
         return $this->renderAjax('edit', [
             'calendarEntryForm' => $calendarEntryForm,
             'contentContainer' => $this->contentContainer,
-            'editUrl' => Url::toEditEntry($calendarEntryForm->entry, $cal, $this->contentContainer)
+            'editUrl' => Url::toEditEntry($calendarEntryForm->entry, $cal, $this->contentContainer, $calendarEntryForm->wall)
         ]);
     }
 
@@ -491,7 +517,7 @@ protected function getCalendarEntry($id): CalendarEntry
      */
     private function canCreateEntries()
     {
-        return $this->contentContainer->permissionManager->can(CreateEntry::class);
+        return (new CalendarEntry($this->contentContainer))->content->canEdit();
     }
 
     /**

diff --git a/controllers/GlobalController.php b/controllers/GlobalController.php
@@ -108,7 +108,7 @@ public function actionSelect($start = null, $end = null)
         }
 
         foreach ($calendarMemberSpaceQuery->all() as $space) {
-            if ($space->permissionManager->can(CreateEntry::class)) {
+            if ((new CalendarEntry($space))->content->canEdit()) {
                 $contentContainerSelection[$space->contentcontainer_id] = $space->displayName;
             }
         }
@@ -131,7 +131,7 @@ public function actionSelectSubmit($start = null, $end = null)
 
         $container = $contentContainer->getPolymorphicRelation();
 
-        if (!$container->permissionManager->can(CreateEntry::class)) {
+        if (!(new CalendarEntry($container))->content->canEdit()) {
             throw new HttpException(403);
         }
 

diff --git a/controllers/rest/CalendarController.php b/controllers/rest/CalendarController.php
@@ -56,7 +56,7 @@ public function actionCreate($containerId)
         /** @var ContentContainerActiveRecord $container */
         $container = $containerRecord->getPolymorphicRelation();
 
-        if (! $container->permissionManager->can(CreateEntry::class)) {
+        if (!(new CalendarEntry($container))->content->canEdit()) {
             return $this->returnError(403, 'You are not allowed to create calendar entry!');
         }
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.4.0-beta.1  (November 7, 2022)
+--------------------------------
+- Enh #331: Implemented new HumHub v1.13 Content Form Support
+
+
 1.3.0 (November 7, 2022)
 ------------------------
 - Enh #328: Remove deprecated checkbox "regular" style

diff --git a/helpers/Url.php b/helpers/Url.php
@@ -120,13 +120,13 @@ public static function toGlobalCreate()
         return static::to(['/calendar/global/select']);
     }
 
-    public static function toEditEntry(CalendarEntry $entry, $cal = null, ContentContainerActiveRecord $container = null)
+    public static function toEditEntry(CalendarEntry $entry, $cal = null, ContentContainerActiveRecord $container = null, $wall = null)
     {
         if(!$container) {
             $container = $entry->content->container;
         }
 
-        return $container->createUrl('/calendar/entry/edit', ['id' => $entry->id, 'cal' => $cal]);
+        return $container->createUrl('/calendar/entry/edit', ['id' => $entry->id, 'cal' => $cal, 'wall' => $wall]);
     }
 
     public static function toEditEntryParticipation(CalendarEntry $entry, ContentContainerActiveRecord $container = null)

diff --git a/models/CalendarEntry.php b/models/CalendarEntry.php
@@ -76,6 +76,11 @@ class CalendarEntry extends ContentActiveRecord implements Searchable, Recurrent
      */
     public $is_public = Content::VISIBILITY_PUBLIC;
 
+    /**
+     * @inheritdoc
+     */
+    protected $createPermission = CreateEntry::class;
+
     /**
      * @inheritdoc
      */

diff --git a/models/forms/CalendarEntryForm.php b/models/forms/CalendarEntryForm.php
@@ -111,21 +111,28 @@ class CalendarEntryForm extends Model
      */
     public $recurrenceForm;
 
+    /**
+     * @var boolean defines if the Task is created from wall stream
+     */
+    public $wall;
+
     /**
      * Will create a new CalendarEntryForm instance with new CalendarEntry model.
      *
      * @param $contentContainer
      * @param string|null $start FullCalendar start datetime e.g.: 2020-01-01 00:00:00
      * @param string|null $end FullCalendar end datetime e.g.: 2020-01-02 00:00:00
      * @param string|null $view FullCalendar view mode, 'month'
+     * @param bool $wall True when a Calendary Entry is created/updated from wall stream
      * @return CalendarEntryForm
      * @throws Exception
      */
-    public static function createEntry($contentContainer, $start = null, $end = null, $view = null)
+    public static function createEntry($contentContainer, $start = null, $end = null, $view = null, $wall = null)
     {
         $instance = new static(['entry' => new CalendarEntry($contentContainer)]);
         $instance->updateDateRangeFromCalendar($start, $end, null, false, $view);
         $instance->setDefaults(); // Make sure default values are based on new start/end
+        $instance->wall = $wall;
         return $instance;
     }
 

diff --git a/module.json b/module.json
@@ -3,9 +3,9 @@
     "name": "Calendar",
     "description": "Calendar for spaces or user profiles.",
     "keywords": ["calendar"],
-    "version": "1.3.0",
+    "version": "1.4.0-beta.1",
     "humhub": {
-        "minVersion": "1.12"
+        "minVersion": "1.13"
     },
     "homepage": "https://github.com/humhub/calendar",
     "authors": [

diff --git a/resources/js/fullcalendar.bundle.min.js b/resources/js/fullcalendar.bundle.min.js
diff --git a/resources/js/humhub.calendar.js b/resources/js/humhub.calendar.js
@@ -12,6 +12,8 @@ humhub.module('calendar', function (module, require, $) {
         var modal = require('ui.modal');
         var action = require('action');
         var Content = require('content').Content;
+        var event = require('event');
+        var StreamEntry = require('stream').StreamEntry;
 
         var Calendar = Widget.extend();
 
@@ -51,6 +53,7 @@ humhub.module('calendar', function (module, require, $) {
             });
 
             this.initTimeInput();
+            this.initSubmitAction();
         };
 
         Form.prototype.setEditMode = function (evt) {
@@ -85,6 +88,29 @@ humhub.module('calendar', function (module, require, $) {
             });
         };
 
+        Form.prototype.initSubmitAction = function () {
+            modal.global.$.one('submitted', onCalEntryFormSubmitted);
+        }
+
+        var onCalEntryFormSubmitted = function (evt, response) {
+            if (response.id) {
+                modal.global.$.one('hidden.bs.modal', function () {
+                    var entry = StreamEntry.getNodeByKey(response.id);
+                    if (entry.length) {
+                        entry = new StreamEntry(entry);
+                        entry.reload();
+                    }
+                });
+            }
+
+            if (response.reloadWall) {
+                event.trigger('humhub:content:newEntry', response.content, this);
+                event.trigger('humhub:content:afterSubmit', response.content, this);
+            } else {
+                modal.global.$.one('submitted', onCalEntryFormSubmitted);
+            }
+        };
+
         Form.prototype.toggleDateTime = function (evt) {
             var $timeFields = modal.global.$.find('.timeField');
             var $timeInputs = $timeFields.find('.form-control');

diff --git a/resources/js/humhub.calendar.min.js b/resources/js/humhub.calendar.min.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -408,4 +408,5 @@ public static function onRestApiAddRules()

		], 'calendar');
		}

		}