Merge pull request #1111 from dpalou/MOBILE-2178

MOBILE-2178 database: Show comments in single view

Author: jleyva

www/addons/mod/data/controllers/entry.js

@@ -109,6 +109,7 @@ angular.module('mm.addons.mod_data')
             var actions = $mmaModDataHelper.getActions(data, access, $scope.entry);
 
             $scope.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields, entryId, 'show', actions);
+            $scope.showComments = actions.comments;
 
             return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
                 $scope.previousId = result.previousId;

www/addons/mod/data/directives/action.js

@@ -28,7 +28,8 @@ angular.module('mm.addons.mod_data')
         scope: {
             action: '@',
             database: '=',
-            entry: '=?'
+            entry: '=?',
+            mode: '@'
         },
         templateUrl: 'addons/mod/data/templates/action.html',
         link: function(scope) {

www/addons/mod/data/services/helper.js

@@ -58,7 +58,8 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
-            render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
+            render = '<mma-mod-data-field field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id +
+                        ']" mode="'+mode+'" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
             template = template.replace(replace, render);
         });
 
@@ -69,7 +70,8 @@ angular.module('mm.addons.mod_data')
                     // Render more url directly because it can be part of an HTML attribute.
                     render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entryId;
                 } else {
-                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +
+                                ']" mode="'+mode+'" database="data"></mma-mod-data-action>';
                 }
                 template = template.replace(replace, render);
             } else {

www/addons/mod/data/templates/action.html

@@ -5,7 +5,7 @@
 <a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
 <a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
 
-<mm-comments ng-if="action == 'comments'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
+<mm-comments ng-if="action == 'comments' && mode == 'list'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
 
 <span ng-if="action == 'moreurl'">{{url}}/mod/data/view.php?d={{entry.dataid}}&amp;rid={{entry.id}}</span>
 <span ng-if="action == 'timeadded'">{{ entry.timecreated * 1000 |  mmFormatDate:"dffulldate" }}</span>

www/addons/mod/data/templates/entry.html

@@ -30,6 +30,7 @@
                     {{ entryRendered }}
                 </mm-format-text>
             </div>
+            <mm-comments class="item" ng-if="showComments" context-level="module" instance-id="{{data.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
             <div ng-if="previousId || nextId" class="item item-text-wrap row-buttons responsive-sm">
                 <button ng-if="previousId" class="button button-block icon-left ion-chevron-left" ng-click="gotoEntry(previousId)">
                     {{ 'mm.core.previous' | translate }}

www/core/components/comments/services/comments.js

@@ -75,9 +75,9 @@ angular.module('mm.core.comments')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 "contextlevel": contextLevel,
-                "instanceid": instanceId,
+                "instanceid": parseInt(instanceId, 10),
                 "component": component,
-                "itemid": itemId
+                "itemid": parseInt(itemId, 10)
             },
             preSets = {};