Merge pull request #1108 from crazyserver/MOBILE-2178

Mobile 2178

Author: jleyva

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

@@ -101,10 +101,10 @@ angular.module('mm.addons.mod_data')
         replacements.timeadded = true;
         replacements.timemodified = true;
 
-        replacements.edit = record.canmanageentry; // This already checks capabilities and readonly period.
-        replacements.delete = replacements.edit;
-        replacements.approve = database.approval && accessInfo.canapprove && !record.approved;
-        replacements.disapprove = database.approval && accessInfo.canapprove && record.approved;
+        replacements.edit = record.canmanageentry && !record.deleted; // This already checks capabilities and readonly period.
+        replacements.delete = record.canmanageentry;
+        replacements.approve = database.approval && accessInfo.canapprove && !record.approved && !record.deleted;
+        replacements.disapprove = database.approval && accessInfo.canapprove && record.approved && !record.deleted;
 
         replacements.approvalstatus = database.approval;
         replacements.comments = database.comments;

www/core/directives/formattext.js

@@ -342,7 +342,7 @@ angular.module('mm.core')
             return;
         }
 
-        var data = JSON.parse(el.getAttribute('data-setup') || '{}'),
+        var data = JSON.parse(el.getAttribute('data-setup') || el.getAttribute('data-setup-lazy') || '{}'),
             youtubeId = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' && data.sources && data.sources[0] &&
                 data.sources[0].src && youtubeGetId(data.sources[0].src);