Skip to content

1.1.5 #64

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.

Sign up for GitHub

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

Open
indynz wants to merge 7 commits into
base: 1.1.5
Choose a base branch
from
Open

1.1.5 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
446e4b8
Namespacing all SplashCMS tables
indynz Nov 3, 2011
1a40b4a
Changing label for all the 'Cancel' links in the admin view
indynz Nov 3, 2011
cdbfea5
On occasions session.currentUser was not existing, leading to error
indynz Nov 3, 2011
10bfb4d
Removing unnecessary whitespace creation on Railo
indynz Nov 3, 2011
9f45189
Changing Redirection after create and update to go back to the same l…
indynz Nov 3, 2011
125911c
Plugin zip files lowercased.
indynz Nov 3, 2011
3f2205a
Changing label from "Cancel" to "Back to Pages" and "Back to Users"
indynz Nov 3, 2011
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
6 changes: 4 additions & 2 deletions controllers/Layouts.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
<cfif layout.save()>

<cfset flashInsert(success="The layout was created successfully")>
<cfset redirectTo(route="layouts_path")>
<cfset redirectTo(route="edit_layout_path", key=layout.id)>
<!--- <cfset redirectTo(route="layouts_path")> --->
<cfelse>
<cfset flashInsert(error="There was an error creating the layout.")>
<cfset renderPage(action="new")>
Expand All @@ -51,7 +52,8 @@

<cfif layout.update(params.layout)>
<cfset flashInsert(success="The layout was updated successfully.")>
<cfset redirectTo(route="layouts_path")>
<cfset redirectTo(route="edit_layout_path", key=layout.id)>
<!--- <cfset redirectTo(route="layouts_path")> --->
<cfelse>
<cfset flashInsert(error="There was an error updating the layout.")>
<cfset renderPage(action="edit")>
Expand Down
7 changes: 5 additions & 2 deletions controllers/Pages.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
</cfloop>

<cfset flashInsert(success="The page has been created successfully.")>
<cfset redirectTo(route="pages_path")>
<cfset redirectTo(route="edit_page_path", key=page.id, parentID=page.parentid)>
<!--- <cfset redirectTo(route="pages_path")> --->
<cfelse>
<cfset flashInsert(error="There was an error creating the page.")>
<cfset renderPage(action="new")>
Expand Down Expand Up @@ -87,7 +88,9 @@
</cfloop>

<cfset flashInsert(success="The page was updated successfully.")>
<cfset redirectTo(route="pages_path")>

<cfset redirectTo(route="edit_page_path", key=page.id, parentID=page.parentid)>
<!--- <cfset redirectTo(route="pages_path")> --->
<cfelse>
<cfset flashInsert(error="There was an error updating the page.")>
<cfset renderPage(action="edit")>
Expand Down
22 changes: 12 additions & 10 deletions controllers/Snippets.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

<cffunction name="new">
<cfset snippet = model('snippet').new()>
<cfset category = model('categories').new()>
<cfset categories = model('categories').findAll()>
<cfset category = model('category').new()>
<cfset categories = model('category').findAll()>
</cffunction>

<cffunction name="edit">
<cfset snippet = model('snippet').findByKey(params.key)>
<cfset category = model('categories').new()>
<cfset categories = model('categories').findAll()>
<cfset category = model('category').new()>
<cfset categories = model('category').findAll()>

<cfif NOT IsObject(snippet)>
<cfset flashInsert(info="No snippet exists for ID #params.key#")>
Expand All @@ -41,10 +41,11 @@

<cfif snippet.save()>
<cfset flashInsert(success="The snippet was created successfully")>
<cfset redirectTo(route="snippets_path")>
<cfset redirectTo(route="edit_snippet_path", key=snippet.id)>
<!--- <cfset redirectTo(route="snippets_path")> --->
<cfelse>
<cfset category = model('categories').new()>
<cfset categories = model('categories').findAll()>
<cfset category = model('category').new()>
<cfset categories = model('category').findAll()>
<cfset flashInsert(error="There was an error creating the snippet.")>
<cfset renderPage(action="new")>
</cfif>
Expand All @@ -65,11 +66,12 @@
<cffile action="write" file="#application.defaults.snippetsPath#/#snippet.fileName#" output="<cfimport taglib='../../lib/splash/tags' prefix='s' />#snippet.content#" addnewline="no" fixnewline="yes" />

<cfset flashInsert(success="The snippet was updated successfully.")>
<cfset redirectTo(route="snippets_path")>
<cfset redirectTo(route="edit_snippet_path", key=snippet.id)>
<!--- <cfset redirectTo(route="snippets_path")> --->
<cfelse>
<cfset flashInsert(error="There was an error updating the snippet.")>
<cfset category = model('categories').new()>
<cfset categories = model('categories').findAll()>
<cfset category = model('category').new()>
<cfset categories = model('category').findAll()>
<cfset renderPage(action="edit")>
</cfif>
</cffunction>
Expand Down
33 changes: 33 additions & 0 deletions db/migrate/20111104073926_namespace_cms_tables.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<cfcomponent extends="plugins.dbmigrate.Migration" hint="namespace cms tables">

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

<cffunction name="up">
<cfscript>
renameTable("categories", "cms_categories");
renameTable("layouts", "cms_layouts");
renameTable("pageclasses", "cms_pageclasses");
renameTable("pageparts", "cms_pageparts");
renameTable("pages", "cms_pages");
renameTable("snippets", "cms_snippets");
renameTable("users", "cms_users");
</cfscript>
</cffunction>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

<cffunction name="down">
<cfscript>
renameTable("cms_categories", "categories");
renameTable("cms_layouts", "layouts");
renameTable("cms_pageclasses", "pageclasses");
renameTable("cms_pageparts", "pageparts");
renameTable("cms_pages", "pages");
renameTable("cms_snippets", "snippets");
renameTable("cms_users", "users");
</cfscript>
</cffunction>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

</cfcomponent>
41 changes: 30 additions & 11 deletions lib/splash/tags/content.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,50 @@
<cfif thisTag.executionMode IS "start">

<cfif thisTag.executionMode IS "start"><cfoutput>#generateContent()#</cfoutput></cfif><cfsilent>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

<cffunction name="generateContent" returnType="string" access="public" output="false">
<cfset var sReturn = "">

<cfparam name="attributes.part" default="">
<cfparam name="attributes.page" default="#request.page#">

<cfset wheelsProxy=CreateObject("component","controllers.Controller") >

<!--- Check if we are inside a "children" related tag --->
<cfif StructKeyExists(request, "tags")>
<cfset attributes.page = request.tags.currentChild>
</cfif>

<!--- Create a wheels proxy so we can use their methods inside a custom tag --->
<cfset wheelsProxy = CreateObject("component","controllers.Controller")>

<!--- Find the desired part --->
<cfset pagePart = wheelsProxy.wheelsExecute("model('pagePart').findByPage(pageID=#attributes.page.ID#, part = '#attributes.part#')")>
<cfif isObject(pagePart)>

<cfif IsObject(pagePart)>
<cfoutput>
<cfif pagePart.fileName is Not "">
<cfif pagePart.fileName IS NOT "">
<cfif fileExists(expandPath("#application.defaults.rootPath#public/pages/#pagePart.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#"></cfsavecontent>
<cfelse>
<cfset pagePart.write()>
<cfif fileExists(expandPath("#application.defaults.rootPath#public/pages/#pagePart.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#"></cfsavecontent>
</cfif>
</cfif>
<cfelse>
<cfset pagePart.fileName = createUUID()>
<cfset pagePart.write()>
<cfset pagePart.save()>
<cfif fileExists(expandPath("#application.defaults.rootPath#public/pages/#pagePart.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/pages/#pagePart.filename#"></cfsavecontent>
</cfif>
</cfif>
</cfoutput>
</cfif>
</cfif>

<cfreturn sReturn>

</cffunction>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

</cfsilent>
25 changes: 18 additions & 7 deletions lib/splash/tags/snippet.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
<cfif thisTag.executionMode IS "start">
<cfif thisTag.executionMode IS "start"><cfoutput>#generateContent()#</cfoutput></cfif><cfsilent>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->

<cffunction name="generateContent" returnType="string" access="public" output="false">
<cfset var sReturn = "">

<cfparam name="attributes.name" default="">

<cfset wheelsProxy=CreateObject("component","controllers.Controller") >

<cfset snippet = wheelsProxy.wheelsExecute("model('snippet').findOneByName('#attributes.name#')")>

<cfif isObject(snippet)>
<cfoutput>
<cfif snippet.filename is Not "">
<cfif fileExists(expandPath("#application.defaults.rootPath#public/snippets/#snippet.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#"></cfsavecontent>
<cfelse>
<cfset snippet.write()>
<cfif fileExists(expandPath("#application.defaults.rootPath#public/snippets/#snippet.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#"></cfsavecontent>
</cfif>
</cfif>
<cfelse>
Expand All @@ -22,9 +28,14 @@
<cfset snippet.write()>
<cfset snippet.save()>
<cfif fileExists(expandPath("#application.defaults.rootPath#public/snippets/#snippet.filename#"))>
<cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#">
<cfsavecontent variable="sReturn"><cfinclude template="#application.defaults.rootPath#public/snippets/#snippet.filename#"></cfsavecontent>
</cfif>
</cfif>
</cfoutput>
</cfif>
</cfif>

<cfreturn sReturn>
</cffunction>

<!--- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: --->
</cfsilent>
1 change: 1 addition & 0 deletions models/Category.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<cfcomponent extends="Model" output="false"><cfscript>

function init(){
table("cms_categories");
hasMany('Snippets');

validatesPresenceOf(properties="name", message="Your category must have a name.");
Expand Down
1 change: 1 addition & 0 deletions models/Layout.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<cfcomponent extends="Model" output="false">

<cffunction name="init">
<cfset table("cms_layouts")>
<cfset hasMany("pages")>

<cfset validatesPresenceOf(property="name" , message="Your layout must have a name.")>
Expand Down
12 changes: 8 additions & 4 deletions models/Model.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<cfcomponent extends="Wheels" output="false">

<cffunction name="setCreatedByID">
<cfset this.createdById = session.currentUser.id>
<cfif structKeyExists(session, "currentUser")>
<cfset this.createdById = session.currentUser.id>
</cfif>
</cffunction>

<cffunction name="setUpdatedByID">
<cfset this.updatedById = session.currentUser.id>
<cfif structKeyExists(session, "currentUser")>
<cfset this.updatedById = session.currentUser.id>
</cfif>
</cffunction>

</cfcomponent>
5 changes: 3 additions & 2 deletions models/Page.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<cfcomponent extends="Model" output="false">

<cffunction name="init">
<cfset table("cms_pages")>
<cfset hasMany('PageParts')>
<cfset belongsTo(name='pageLayout', class="layout", foreignKey="layoutID")>
<cfset belongsTo(name='pageLayout', modelName="layout", foreignKey="layoutID")>
<cfset belongsTo('PageClass')>
<cfset belongsTo(name="author", class="user", foreignKey="createdByID")>
<cfset belongsTo(name="author", modelName="user", foreignKey="createdByID")>

<cfset validatesPresenceOf(property="title" , message="Your page must have a title.")>
<cfset validatesLengthOf(properties="title,keywords,description", message="You have exceeded the maximun length", allowBlank="true", maximum="255")>
Expand Down
1 change: 1 addition & 0 deletions models/PageClass.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<cfcomponent output="false" extends="Model">

<cffunction name="init">
<cfset table("cms_pageclasses")>
<cfset hasMany("Pages")>
</cffunction>

Expand Down
1 change: 1 addition & 0 deletions models/PagePart.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<cfcomponent output="false" extends="Model">

<cffunction name="init">
<cfset table("cms_pageparts")>
<cfset belongsTo('page')>
<cfset beforeUpdate('deleteOldFile')>
<cfset afterCreate('write')>
Expand Down
1 change: 1 addition & 0 deletions models/Snippet.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<cfcomponent extends="Model" output="false">

<cffunction name="init">
<cfset table("cms_snippets")>
<cfset belongsTo(name='Category', joinType="outer")>

<cfset validatesPresenceOf(property="name" , message="Your snippet must have a name.")>
Expand Down
1 change: 1 addition & 0 deletions models/User.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<cfcomponent extends="Model" output="false">

<cffunction name="init">
<cfset table("cms_users")>
<cfset hasMany("pages")>

<cfset validatesPresenceOf(property="username", message="Username is required")>
Expand Down
Binary file removed plugins/RichText-0.1.zip
View file
Open in desktop
Binary file not shown.
Loading