Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a duplicate, editable template to the template collection #1548

Merged
merged 2 commits into from
Nov 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/collections/schemas/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ import { Audience } from "./layouts";

export const Templates = new SimpleSchema({
name: {
type: String,
index: true
type: String
},
isOriginalTemplate: {
type: Boolean,
optional: true,
defaultValue: false
},
priority: {
type: Number,
Expand Down
1 change: 1 addition & 0 deletions server/api/core/import.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ Import.template = function (templateInfo, shopId) {

const key = {
name: templateInfo.name,
isOriginalTemplate: templateInfo.isOriginalTemplate,
shopId: shopId
};

Expand Down
30 changes: 29 additions & 1 deletion server/api/core/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,25 @@ export function registerTemplateForDatabase(templateInfo, shopId, insertImmediat
// and should not stored in the database
const templateInfoForDatabase = processTemplateInfoForDatabase(templateInfo);

Import.template(templateInfoForDatabase, shopId);
// Import the template, but marke it as original so it sould not be edited
// This way, the shop admins will always be able to revert to default,
// and it makes logic in the front end a little easier
Import.template({
...templateInfoForDatabase,
isOriginalTemplate: true
}, shopId);

const foundTemplate = Templates.findOne({
name: templateInfoForDatabase.name,
isOriginalTemplate: false,
shopId: shopId
});

// Import a duplicate that is meant to be user editable, but only once if it
// does't exist.
if (!foundTemplate) {
Import.template(templateInfoForDatabase, shopId);
}

if (insertImmediately) {
Import.flush();
Expand All @@ -69,6 +87,16 @@ export function getTemplateByName(templateName, shopId) {

const templateInfo = Templates.findOne({
name: templateName,
$or: [
// Attemt to find user editable / edited templated first
{
isOriginalTemplate: false
},
// Fallback to the original templates
{
isOriginalTemplate: true
}
],
shopId
});

Expand Down