Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6fbe54c

Browse files
committed
Remove meta_fields, meta_types, meta_labels from node metadata, use exposed plugins configs instead. Fix CSS labels on detailed view.
1 parent 8ee9ad7 commit 6fbe54c

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

core/src/plugins/meta.user/class.MetaCellRenderer.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,10 @@ Class.create("MetaCellRenderer", {
174174
}
175175
}else if(type == 'detail'){
176176

177-
if(element.nodeName.toLowerCase() == 'span') return;
177+
if(element.nodeName.toLowerCase() == 'span') {
178+
element = element.up(".detailed");
179+
if(!element) return;
180+
}
178181
content = ajxpNode.getMetadata().get(attName);
179182
if(content){
180183
obj = new MetaCellRenderer();

core/src/plugins/meta.user/class.UserMetaManager.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,11 @@ public function editMeta($actionName, $httpVars, $fileVars)
301301
*/
302302
public function extractMeta(&$ajxpNode, $contextNode = false, $details = false)
303303
{
304-
//$metadata = $this->metaStore->retrieveMetadata($ajxpNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
305304
$metadata = $ajxpNode->retrieveMetadata("users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
306305
if (count($metadata)) {
307306
// @todo : Should be UTF8-IZED at output only !!??
308307
// array_map(array("SystemTextEncoding", "toUTF8"), $metadata);
309308
}
310-
$metadata["meta_fields"] = $this->options["meta_fields"];
311-
$metadata["meta_labels"] = $this->options["meta_labels"];
312-
$metadata["meta_types"] = $this->options["meta_types"];
313309
$ajxpNode->mergeMetadata($metadata);
314310

315311
}

core/src/plugins/meta.user/manifest.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,15 @@
7171
var form = $(oForm).select('div[id="user_meta_form"]')[0];
7272
var nodeMeta = $H();
7373
var firstNodeMeta = userSelection.getUniqueNode().getMetadata();
74-
var metaFields = firstNodeMeta.get('meta_fields').split(',');
75-
var metaLabels = firstNodeMeta.get('meta_labels').split(',');
76-
var metaTypes = firstNodeMeta.get('meta_types').split(',');
74+
var metaConfigs = MetaCellRenderer.prototype.staticGetMetaConfigs();
7775
if(userSelection.isUnique()){
7876
nodeMeta = firstNodeMeta;
7977
}
80-
for(var i=0;i<metaFields.length;i++){
81-
var value = nodeMeta.get(metaFields[i]) || '';
82-
form.insert('<div class="SF_element"><div class="SF_label">'+metaLabels[i]+' : </div><input class="SF_input" name="'+metaFields[i]+'" value="'+value.replace(/"/g, '&quot;')+'"/></div>');
83-
var element = form.down('input[name="'+metaFields[i]+'"]');
84-
var fieldType = metaTypes[i];
78+
metaConfigs.each(function(pair){
79+
var value = nodeMeta.get(pair.key) || '';
80+
form.insert('<div class="SF_element"><div class="SF_label">'+pair.value.label+' : </div><input class="SF_input" name="'+pair.key+'" value="'+value.replace(/"/g, '&quot;')+'"/></div>');
81+
var element = form.down('input[name="'+pair.key+'"]');
82+
var fieldType = pair.value.type;
8583
if(fieldType == 'stars_rate'){
8684
MetaCellRenderer.prototype.formPanelStars(element, form);
8785
}else if(fieldType == 'css_label'){
@@ -95,7 +93,7 @@
9593
}else if(fieldType == 'updater' || fieldType == 'creator'){
9694
element.disabled = true;
9795
}
98-
}
96+
});
9997
}
10098
var closeFunc = function(){
10199
var oForm = $(modal.getForm());

0 commit comments

Comments
 (0)