CMS Mostly Working

modules/mop/MoPUI.js

@@ -385,14 +385,14 @@ mop.ui.UIElement = new Class({
 		if( json && json.error ){
 			this.validationSticky = new mop.ui.Sticky( this, {
 				title: "Error:",
-				message: json.message,
+				message: json.response.message,
 				scrollContext: this.options.scrollContext
 			});
 			this.validationSticky.show();
 		}else{
 			if( this.onCompleteCallbacks.length > 0 ){
 				for( var i = 0; i < this.onCompleteCallbacks.length; i++ ){
-					this.onCompleteCallbacks[i]( json, this );
+					this.onCompleteCallbacks[i]( json.response, this );
 				}
 			}
 		}
@@ -433,7 +433,7 @@ mop.ui.UIElement = new Class({
 
 		if( this.showSaving ) this.showSaving();
 
-		var url = mop.util.getAppURL() + this.marshal.getSubmissionController() + "/ajax/" + this.action + "/" + this.marshal.getObjectId();
+		var url = mop.util.getAppURL() +"ajax/data/" + this.marshal.getSubmissionController() + "/" + this.action + "/" + this.marshal.getObjectId();
 		var submittedVars = { field: this.fieldName, value: val };
 
 		console.log( "SUBMIT ", url, submittedVars );
@@ -2296,7 +2296,7 @@ mop.ui.FileElement = new Class({
 	},
 
 	getSubmitURL: function(){
-		var url = mop.util.getAppURL() + this.marshal.getSubmissionController() + "/ajax/" + this.action + "/" + this.marshal.getObjectId();
+		var url = mop.util.getAppURL() + "ajax/data/" + this.marshal.getSubmissionController() + "/" + this.action + "/" + this.marshal.getObjectId();
 //		console.log( ":::: ", this.toString(), "getSubmitURL: ", url );
 		return 	url;
 	},
@@ -3106,7 +3106,7 @@ mop.ui.CheckBox = new Class({
 
 		if( this.showSaving ) this.showSaving();
 
-		var url = mop.util.getAppURL() + this.marshal.getSubmissionController() + "/ajax/" + this.action + "/" + this.marshal.getObjectId();
+		var url = mop.util.getAppURL() + "ajax/data/" + this.marshal.getSubmissionController() + "/" + this.action + "/" + this.marshal.getObjectId();
 		var submittedVars = { field: this.fieldName, value: val };
 		console.log( this.toString(), "submit", url, submittedVars );
 		mop.util.JSONSend( url, submittedVars, { onComplete: this.onResponse.bind( this ) } );
@@ -4061,7 +4061,7 @@ mop.ui.PaginationControls = new Class({
 		}else{
 			this.spinner.removeClass( "hidden" );
 			var marshalId = ( this.marshal.instanceName )? this.marshal.instanceName : this.marshal.get("id");
-			var url = mop.util.getAppURL() + marshalId + "/ajax/" + this.method + "/" + this.listId + "/" + this.currentPage;
+			var url = mop.util.getAppURL() + "ajax/data/" + marshalId + "/" + this.method + "/" + this.listId + "/" + this.currentPage;
 			var postData = ( this.marshal.getPaginationPostData )? this.marshal.getPaginationPostData() : null ; //getGeneratedDataQueryString() : null;
 //			console.log( this.toString(), "paginate uncached page >> ", url, postData );
 			mop.util.JSONSend( url, postData, { onComplete: this.onPagination.bind( this ) } );

modules/mopcms/classes/model/page.php

@@ -8,6 +8,9 @@ class Model_Page extends ORM {
 	protected $_belongs_to = array(
 		'template'=>array()
 	);
+        protected $_has_one = array(
+          'template'=>array()  
+        );
 
 	public $content = null;
 

modules/mopcms/classes/model/template.php

@@ -5,6 +5,7 @@
  */
 class Model_Template extends ORM {
 	protected $_has_many = array('page'=>array());
+        protected $_belongs_to = array('page'=>array());
 
   /*
    * Variable: nonmappedfield

modules/mopcms/classes/mop/cmsinterface.php

@@ -34,9 +34,9 @@ public function __construct($request, $response){
 		 'result'=>'success',
 	 );
 	 */
-	public function saveFile($pageid){
+	public function action_saveFile($pageid){
 
-		$file = cms::saveHttpPostFile($pageid, $_POST['field'], $_FILES[$_POST['field']]);
+		$file = mopcms::saveHttpPostFile($pageid, $_POST['field'], $_FILES[$_POST['field']]);
 		$result = array(
 			'id'=>$file->id,
 			'src'=>$file->original->fullpath,
@@ -48,8 +48,8 @@ public function saveFile($pageid){
 		//if it's an image
 		$thumbSrc = null;
 		if($file->uithumb->filename){
-			if(file_exists(cms::mediapath().$file->uithumb->filename)){
-				$resultpath = cms::mediapath().$file->uithumb->filename;
+			if(file_exists(mopcms::mediapath().$file->uithumb->filename)){
+				$resultpath = mopcms::mediapath().$file->uithumb->filename;
 				$thumbSrc = Kohana::config('cms.basemediapath').$file->uithumb->filename;
 			}
 		}
@@ -75,19 +75,20 @@ public function saveFile($pageid){
 	* $_POST['value'] - the value to save
 	* Returns: array('value'=>{value})
 	 */
-	public function savefield($id){
-		$page = ORM::Factory('page')->find($id);
+	public function action_savefield($id){
+		$page = ORM::Factory('page', $id);
+
 		if($_POST['field']=='slug'){
-			$page->slug = cms::createSlug($_POST['value'], $page->id);
+			$page->slug = mopcms::createSlug($_POST['value'], $page->id);
 			$page->decoupleSlugTitle = 1;
 			$page->save();
 			return array('value'=>$page->slug);
 		} else if($_POST['field']=='title'){ //update slug, but actually we may not want to have slug updatable
 			if(!$page->decoupleSlugTitle){
-				$page->slug = cms::createSlug($_POST['value'], $page->id);
+				$page->slug = mopcms::createSlug($_POST['value'], $page->id);
 			}
 			$page->save();
-			$page->contenttable->$_POST['field'] = cms::convertNewlines($_POST['value']);
+			$page->contenttable->$_POST['field'] = mopcms::convertNewlines($_POST['value']);
 			$page->contenttable->save();
 			$page = ORM::Factory('page')->find($id);
 			return array('value'=>$page->contenttable->$_POST['field'], 'slug'=>$page->slug);
@@ -96,11 +97,12 @@ public function savefield($id){
 			$page->$_POST['field'] = $_POST['value'];
 			$page->save();
 		} else if($_POST['field']) {
-			$fieldInfo = mop::config('objects', sprintf('//template[@name="%s"]/elements/*[@field="%s"]',
-																									$page->template->templatename,
-																									$_POST['field']))->item(0);
+			$xpath = sprintf('//template[@name="%s"]/elements/*[@field="%s"]',
+				$page->template->templatename,
+				$_POST['field']);
+			$fieldInfo = mop::config('objects', $xpath)->item(0);
 			if(!$fieldInfo){
-				die('Invalid field for template.  Check for correct page/object ID in URL');
+				throw new Kohana_Exception('Invalid field for template, using XPath : :xpath', array(':xpath'=>$xpath));
 			}
 
 
@@ -129,7 +131,7 @@ public function savefield($id){
 				$object->contenttable->save();
 				break;	
 			default:
-				$page->contenttable->$_POST['field'] = cms::convertNewlines($_POST['value']);
+				$page->contenttable->$_POST['field'] = mopcms::convertNewlines($_POST['value']);
 				$page->contenttable->save();
 				break;
 			}
@@ -148,7 +150,7 @@ public function savefield($id){
 		id - the id to toggle
 		Returns: Published status (0 or 1)
 		*/
-		public function togglePublish($id){
+		public function action_togglePublish($id){
 			$page = ORM::Factory('page')->find($id);
 			if($page->published==0){
 				$page->published = 1;
@@ -166,7 +168,7 @@ public function togglePublish($id){
 		Parameters:
 		$_POST['sortorder'] - array of page ids in their new sort order
 		*/
-		public function saveSortOrder(){
+		public function action_saveSortOrder(){
 			$order = explode(',', $_POST['sortorder']);
 
 			for($i=0; $i<count($order); $i++){
@@ -186,7 +188,7 @@ public function saveSortOrder(){
 		 deletes a page/category and all categories and leaves underneath
 		 Returns: returns html for undelete pane 
 		*/
-		public function delete($id){
+		public function action_delete($id){
 			$this->cascade_delete($id);
 
 			$this->view = new View('mop_cms_undelete');
@@ -201,7 +203,7 @@ public function delete($id){
 
 		 Returns: 1;
 		*/
-		public function undelete($id) {
+		public function action_undelete($id) {
 			$this->cascade_undelete($id);
 			//should return something about failure...
 			return 1;
@@ -242,7 +244,7 @@ private function cascade_delete($id){
 	private function cascade_undelete($page_id){
 		$page = ORM::Factory('page')->find($id);
 		$page->activity = new Database_Expr('NULL');
-		$page->slug = cms::createSlug($page->contenttable->title, $page->id);
+		$page->slug = mopcms::createSlug($page->contenttable->title, $page->id);
 		$page->save();
 		$page->contenttable->activity = new Database_Expr('NULL');;
 		$page->contenttable->save();
@@ -260,7 +262,7 @@ private function cascade_undelete($page_id){
 	Function: saveFieldMapping($itemid)
 	Wrapper to saveFieldMapping in CMS_Services_Controller
 	*/
-	public function saveFieldMapping($itemid){
+	public function action_saveFieldMapping($itemid){
 		$object = ORM::Factory($this->model, $itemid);
 		return $object->saveFieldMapping($_POST['field'], $_POST['value']);
 	}

modules/mopcms/views/js/mop_cms.js

@@ -69,10 +69,10 @@ mop.modules.CMS = new Class({
 			    console.log( this.toString(), "loadJS loading ", urlString );
 				mop.util.loadJS( urlString, { type: "text/javascript", onload: this.onJSLoaded.bind( this, [ pageData.html, this.currentPageLoadIndex ] ) } );
 			}, this);			
-		}else{
-			this.populate( pageData.html );
 		}
 
+		this.populate( pageData.html );
+
 	},
 
 	onJSLoaded: function( pageHTML, pageLoadCount ){

modules/mopcore/classes/controller/ajax.php

@@ -29,9 +29,9 @@ public function action_data($uri)
 		} catch (Exception $e) {
 			$ajaxResponse = array(
 				'returnValue' => TRUE,
-				'response'=>$data
 			);
 			echo "CALL A FUNCITON HERE TO COMMUNICATION EXCEPTION TO CLIENTSIDE";	
+			throw $e;
 			return;
 		}
 		$ajaxResponse = array(