diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 5d2f448722a..156098179ec 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -108,7 +108,8 @@ 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.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields,
+ $scope.entry, 'show', actions);
$scope.showComments = actions.comments;
return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 16d48783748..65a1ea09c17 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -48,7 +48,7 @@ angular.module('mm.addons.mod_data')
$scope.search = {
sortBy: "0",
- sortDirection: "ASC",
+ sortDirection: "DESC",
page: 0,
text: "",
searching: false,
@@ -254,7 +254,7 @@ angular.module('mm.addons.mod_data')
var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
- entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
+ entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry, 'list', actions);
});
entriesHTML += data.listtemplatefooter;
@@ -386,7 +386,7 @@ angular.module('mm.addons.mod_data')
// Reset all search filters and closes the modal.
$scope.searchReset = function() {
$scope.search.sortBy = "0";
- $scope.search.sortDirection = "ASC";
+ $scope.search.sortDirection = "DESC";
$scope.search.text = "";
$scope.search.advanced = {};
$scope.search.searchingAdvanced = false;
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index 1a97133288e..cd181b6fd86 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,3 +1,3 @@
-{{field.name}}
+{{field.name}}
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index a45596daa7d..4fcffde0547 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -25,7 +25,7 @@
padding: 0;
}
- td {
+ td, th {
@extend .col;
}
}
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 5454e64c275..29e819afac1 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -315,7 +315,7 @@ angular.module('mm.addons.mod_data')
perpage: perPage || mmaModDataPerPage,
groupid: groupId || 0,
sort: sort || "0",
- order: order || "ASC"
+ order: order || "DESC"
},
preSets = {
cacheKey: getEntriesCacheKey(dataId, groupId)
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 606c63d591c..0bb1c466418 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
* @name $mmaModDataHelper
*/
.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader, $mmSite,
- $mmaModDataOffline, $mmFS, $mmFileUploaderHelper, $mmSitesManager) {
+ $mmaModDataOffline, $mmFS, $mmFileUploaderHelper, $mmSitesManager, $translate) {
var self = {
searchOther: {
@@ -39,12 +39,12 @@ angular.module('mm.addons.mod_data')
* @name $mmaModDataHelper#displayShowFields
* @param {String} template Template HMTL.
* @param {Array} fields Fields that defines every content in the entry.
- * @param {Number} entryId Entry ID.
+ * @param {Object} entry Entry.
* @param {String} mode Mode list or show.
* @param {Object} actions Actions that can be performed to the record.
* @return {String} Generated HTML.
*/
- self.displayShowFields = function(template, fields, entryId, mode, actions) {
+ self.displayShowFields = function(template, fields, entry, mode, actions) {
if (!template) {
return "";
}
@@ -58,19 +58,21 @@ angular.module('mm.addons.mod_data')
replace = new RegExp(replace, 'gi');
// Replace field by a generic directive.
- render = '';
+ render = '';
template = template.replace(replace, render);
});
angular.forEach(actions, function(enabled, action) {
replace = new RegExp("##" + action + "##", 'gi');
if (enabled) {
- if (action == "moreurl") {
+ if (action == 'moreurl') {
// 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;
+ render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entry.id;
+ } else if (action == 'approvalstatus') {
+ render = $translate.instant('mma.mod_data.' + (entry.approved ? 'approved' : 'notapproved'));
} else {
- render = '';
}
template = template.replace(replace, render);
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index e7956f1a06f..bdcf40f3a66 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -81,7 +81,7 @@ angular.module('mm.addons.mod_data')
files = [];
return $mmaModData.getDatabase(courseId, module.id, siteId, forceCache).then(function(data) {
- files = self.getIntroFilesFromInstance(module, database);
+ files = self.getIntroFilesFromInstance(module, data);
database = data;
return $mmGroups.getActivityGroupInfo(module.id, false, undefined, siteId).then(function(groupInfo) {
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
index e0e34ec144e..8c111539f47 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -7,15 +7,9 @@
-{{url}}/mod/data/view.php?d={{entry.dataid}}&rid={{entry.id}}
{{ entry.timecreated * 1000 | mmFormatDate:"dffulldate" }}
{{ entry.timemodified * 1000 | mmFormatDate:"dffulldate" }}
-
- {{ 'mma.mod_data.approved' | translate }}
- {{ 'mma.mod_data.notapproved' | translate }}
-
-